renamed stuff
Merge branch 'bugfix_40' of github.com:Bakkes/Karo into bugfix_40