Merge pull request #1 from cloudwu/master

合并来自作者的修改