Merge pull request #30 from jdm/master

上游合并
Merge pull request #31 from jdm/master

上游合并
Merge pull request #32 from jdm/master

上游合并
Merge pull request #33 from jdm/master

合并
Merge pull request #34 from jdm/master

合并
Update zh_CN translation
Merge pull request #214 from meteormatt/master

Update zh_CN translation