fix some bugs
Merge pull request #8 from lei-april/master

fix some bugs