package.json name and version
Merge branch 'master' into latest