Merge branch 'master' into searls-master

Conflicts:
	README.md