7 hotfix
Merge branch 'hotfix/7' into develop

Conflicts:
	readme.md