mikecoder translating
Merge pull request #987 from MikeCoder/master

mikecoder translating