Merge branch 'master' into more-work

Conflicts:
	README.md