Merge pull request #1 from Joyguo0/master

Merge pull request #6 from chenlihua/master
Merge pull request #7 from chenlihua/master

Merge pull request #1 from Joyguo0/master