Merge pull request #3 from 52North/develop

Develop