translating
Merge pull request #502 from icybreaker/master

translating