Merge pull request #13 from philipp-mueller/master

Merge zu einer neuen Version