revise some words
Merge branch 'origin/master'