small improvements to design and codestyle
Merge branch 'master' of github.com:jumph-io/Jumph