Merge remote-tracking branch 'origin/master'

# Conflicts:
#	cmd.go

fix space spilt

README.md