hotfix
Merge branch 'develop' into hotfix

Conflicts:
	README.md
Merge branch 'develop' into hotfix

Conflicts:
	README.md