translated
Merge pull request #300 from l3b2w1/master

Translated finally