Some work from home

But did not sync before hand
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.txt