Merge pull request #1 from bingjiehuang/master

First version by hbj