translated
Merge pull request #950 from JonathanKang/master

translated