Merge pull request #7 from wangzhaojiang/master

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

Merge pull request #7 from wangzhaojiang/master