Merge pull request #3 from wanghuan8086/master

lol
Merge pull request #7 from wanghuan8088/master

Merge pull request #3 from wanghuan8086/master