bugs
Merge pull request #36 from futurity-pro/bugs

bugs