Merge pull request #3 from 52North/develop

Develop
Merge pull request #16 from ridoo/master

Merge pull request #3 from 52North/develop