Version 0.5.5
Version 0.5.6
Merge branch 'v0.5'

Conflicts:
	package.json