hotfix2
Merge branch 'hotfix2' into develop

Conflicts:
	README.md