Merge pull request #1 from janno42/master

Merge master into develop
Merge pull request #2 from janno42/develop

Merge pull request #1 from janno42/master