Renaming the json package file
Merge branch 'master' into gh-pages