updated json configuration, refactored configuration handling
fixed code standard
Merge pull request #85 from zelgerj/master

updated json configuration, refactored configuration handling