proper build
0.4.6
Merge remote-tracking branch 'origin/master'

Conflicts:
	package.json
0.4.10