fixed some typoes.
merge xueshanf's changes
Merge branch 'xueshanf-master'