Merge pull request #19 from johannhof/master

Bitte mergen, große Änderungen
Merge branch 'master' into anton