Merge pull request #2 from rhiokim/master

update
Merge pull request #3 from rhiokim/master

update
update zh translation
Merge pull request #17 from breeswish/zh-translation

update zh translation