user fix
Merge remote-tracking branch 'origin/master'

Conflicts:
	setup/index.js
user fix