REV-4 My amazing commit
Merge branch 'master' into temp-branch

Conflicts:
	README.md