Merge branch 'develop' into version/2.0.0

Conflicts:
	README.md