Translated
Merge pull request #1317 from JonathanKang/master

Translated