Merging in pull request for JSON and cleaning