Merge branch 'release/1.0.1' into develop
Merge branch 'version_1.0' into develop

Conflicts:
	README.md
Merge branch 'release/Version_1.0.1'