Merge branch 'release/1'
jhot fix
Merge branch 'hotfix/bug' into develop

Conflicts:
	README.md