translated
Merge pull request #51 from flsf/master

translated