modify some small errors, and style mistakes
Merge remote-tracking branch 'origin/master'