Modified README.md

Conflicts:
	README.md
Merge branch 'public-master' into private-oss

Conflicts:
	README.md