Merge pull request #5 from mawb/master

shejiwendang
Merge pull request #1 from duanhp/master

HHHHH