some polishing
Merge branch 'master' of github.com:ajantis/simple-sample-service