translating
Merge pull request #824 from NearTan/master

translating