0.3.0
Merge branch 'dev'

* dev:
  0.3.0

Conflicts:
	package.json