Update README.md
Merge branch 'master' into zjerryj-master

Conflicts:
	README.md