chi1shi2 translating
Merge pull request #1541 from chi1shi2/master

chi1shi2 is translating