fix
Merge pull request #130 from wangbailin/master

fix
fix bugs
Merge pull request #131 from wangbailin/master

fix bugs
Merge pull request #132 from limijiaoyin/master

fix bugs