sync latest
fix typo
fix typo
Merge pull request #155 from natee/master

zh-CN sync latest change