Updated msg!
Merge branch 'hotfix-0.1' into develop

Conflicts:
	README
Merge branch 'master' into develop

Conflicts:
	README