Merge pull request #2 from wangzhaojiang/master

同步
Merge pull request #12 from Jensyn/master

Merge pull request #2 from wangzhaojiang/master