Merge pull request #1 from janno42/master

Merge master into develop