0.4.2

Conflicts:
	package.json