fix bugs
Merge pull request #1 from 7655cjc/master

fix bugs