Update package.json
Update README.md
Merge branch 'dev'