Merge pull request #1 from wanghuan8086/master

up
Merge pull request #5 from wanghuan8088/master

Merge pull request #1 from wanghuan8086/master