fix bugs
Merge pull request #28 from leplay/master

 fix bugs