readme fixes
Merge branch 'master' into readme-fixes

Conflicts:
	README.md