translated
translated
Merge pull request #980 from JonathanKang/master

Translated