Update README.md
Merge branch 'master' into cleanup

Conflicts:
	README.md