mike make change
Fixed bug for 0.1
Merge branch 'hotfix-0.1' into develop

Conflicts:
	README