kleinere Refactoring-Arbeiten
Merge branch 'master' of https://github.com/yjung/WebStuff