define methods directly after their declarations, use typename instead of class
Merge branch 'master' of github.com:Tsunami-prakt/Tsunami-Praktikum