Merge pull request #4 from wangzhaojiang/master

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

Merge pull request #4 from wangzhaojiang/master