Translating by John
Merge pull request #1120 from johnhoow/master

Translating by johnhoow