Merge pull request #2 from liuzg129/master

蛋蛋
wj