Improve JSON
Merge pull request #267 from gadcam/master

Improve JSON