Merge pull request #6 from jan-schreib/develop

Develop
Merge branch 'master' into develop