Merge with master and last improvements

please look at my changes and merge this pull request into your ticket_433 branch. 
I made a full(!) master merge into your changes and I added some last improvements and bugfixes. 
After you merged this pull request into your ticket_433 branch, Oskar can merge your whole pull request into master. Thanks for your work!