Merge pull request #1 from hanxi/master

合并 hanxi 的贡献