Merge pull request #2 from thomaroger/master

Merger master into develop
update route
Merge pull request #3 from thomaroger/troger-init-pull

update route
Merge pull request #4 from thomaroger/develop

Merge develop into master