Various changes thanks to the long flight. First commit from Vancouver!
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md