Release version
Merge branch '0.2.x'

Conflicts:
	README.md
	lib/version.js
	package.json