Fix to use Goroutine
Fix message
Merge remote-tracking branch 'origin/master'

Conflicts:
	commands.go