Merge pull request #46 from JSHgithub/master

a new pull request
Merge pull request #9 from qatang/dev

merge