fix bugs
Merge pull request #18 from zhangshaolong/master

fix bugs