Great, I will merge it, but there is a conflict wi...

# tornadofx

[edvin]

Great, I will merge it, but there is a conflict with the master branch, so I have to do it manually.