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

bugs