Added JSON support
Merge branch 'master' of https://github.com/zulis/Sandbox