Documentation updates
Merge branch 'master' into uuid-support

Conflicts:
	README.md