Merge pull request #6 from wangzhaojiang/master

同步代码
Merge pull request #20 from Jensyn/master

Merge pull request #6 from wangzhaojiang/master