0.5.0-4

Conflicts:
	package.json
Merge remote-tracking branch 'upstream/master'

Conflicts:
	package.json