Update build
0.3.0
Merge branch 'master' into gh-pages

Conflicts:
	package.json
Update build