Merge pull request #5 from wangzhaojiang/master

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

Merge pull request #5 from wangzhaojiang/master