0.1
Merge branch 'dev'

Conflicts:
	package.json
0.1.1
Merge branch 'master' into dev