Merge pull request #16 from Quaese/master

Bitte mergen
Revert "Bitte mergen"
Merge pull request #17 from Quaese/revert-16-master

Revert "Bitte mergen"
Merge pull request #18 from Quaese/develop

Develop