Updates to readme.
Merge branch 'develop' into develop
Conflicts:
	README.md