0.1.0
Merge branch 'master' into update/package

Conflicts:
	package.json