bugfix
Merge branch 'feature/hotfix'

Conflicts:
	package.json