Minor changes in package.json and README.md
Merge branch 'dev'
Minor changes in package.json and README.md
Merge branch 'dev'

Conflicts:
	README.md
	package.json