Merge branch 'master' into gh-pages
added json extension step 1
Merge branch 'gh-pages' into json-extension