fix some typos
Merge origin/master