Merge pull request #2 from lxx123/master

ooooooo