Merge pull request #529 from xhacker/zh_CN