Fix broken documentation.
Merge branch 'master' into topic/updateDocumentation

Conflicts:
	README.md
Merge branch 'topic/updateDocumentation'