0.2.2
Merge branch 'master' into unstable

Conflicts:
	package.json