More fixes
Merge pull request #83 from braincorp/fix-bug

More fixes