Merge pull request #2 from liuning-geek/master

23