Merge pull request #9 from 52North/develop

Merge with latest updates from 52North:develop
Merge remote-tracking branch 'upstream/master' into develop