Merge pull request #2 from philippkueng/develop

Develop