More tweaks and fixes.
Grammar fix.
Merge branch 'master' into working

Conflicts:
	README.md