Merge branch 'hotfix-0.1'
Fixed 0.1.2 bug
Merge branch 'hotfix-0.1.2'
Merge branch 'master' into develop

Conflicts:
	README