Big code update, brushed up comments.
Merge remote-tracking branch 'origin/master'

Conflicts:
	README
	README.md