fix bugs
Merge pull request #131 from wangbailin/master

fix bugs