fix bugs
Merge pull request #6 from zhujy8833/fix

fix bugs