Merge pull request #130 from wangbailin/master

fix
fix bugs