Bugfix
Merge branch 'new' of https://github.com/Softwarebaecker/TW-EK into new