Merge pull request #1 from tg123/master

update
翻译
Merge pull request #2 from tg123/master

update
Aug 14 patch