Merge remote branch 'frakturfreak/kapitel3'