Merge pull request #65 from JSHgithub/master

a new pull request
fix bug
Merge pull request #16 from qatang/dev

Dev