More refactoring, feel the churn.
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md