Merge pull request #3 from wanghuan8086/master

lol