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