Merge pull request #13 from ridoo/master

cosmetics
Merge pull request #15 from ridoo/master

using jgitflow maven plugin
Merge pull request #3 from 52North/develop

Develop