Update README.md
Merge branch 'master' into v1

Conflicts:
	README.md