Merge pull request #12 from 52North/develop

Develop
refactor names and update api-doc
Merge pull request #70 from ridoo/master

merge current updates