Update package.json
Merge origin/master