bump to version 0.3.0-6
bump to version 0.3.0-7
Merge remote-tracking branch 'origin/master'

Conflicts:
	package.json