Merge pull request #13 from philipp-mueller/master

Merge zu einer neuen Version
Merge pull request #14 from philipp-mueller/stable

Merge pull request #13 from philipp-mueller/master