Minor config fix and version bump
Merge branch 'origin/develop'

Conflicts:
	package.json