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

Conflicts:
	README.md