修bug
Merge pull request #22 from JiaJiaJiang/master

修bug