Merge pull request #66 from ridoo/master

merge feature branches to main branch
Merge pull request #68 from ridoo/master

hotfix for #67
Merge pull request #12 from 52North/develop

Develop