Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md
Merge pull request #1 from richhaynes/some-new-feature

pull my structural edits confirmed