fix bugs
Merge pull request #34 from futurity-pro/bugs

fix bugs