Bugfixes
Merge branch 'master' of https://github.com/Ammon93/JMuehle.git