#7: Version without json
#7: Style fix
Merge pull request #32 from it-workshop/wp/7/1

Wp/7/1