* Use two-callback instead of throw pattern in select
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/cmd.js