Merge pull request #6 from gauss1314/master

fix bug
Merge pull request #7 from gauss1314/development

Merge pull request #6 from gauss1314/master