Fixes
Merge pull request #81 from braincorp/fix-bug

Fixes