Kleine bugfixes
Merge branch 'master' of https://github.com/Marghytis/Sarah-s-Welt.git