Merge pull request #1 from bingjiehuang/master

First version by hbj
Merge pull request #1 from zxtxin/master

Merge pull request #1 from bingjiehuang/master