v0.0.x: 0.0.2
Merge branch 'v0.0.x' into v0.1.x

Conflicts:
	package.json