merge
0.2.4
0.3.0
Conflicts:
	package.json
0.3.2
0.3.3