Klassen gefixt
Merge origin/master