translated
Merge pull request #1020 from JonathanKang/master

translated