Merge pull request #6 from nicolindemann/master

Master
Merge pull request #7 from nicolindemann/develop

Merge pull request #6 from nicolindemann/master