Just added brackets
Fix issue #33
Fix issue #37
Merge pull request #38 from UnBiquitous/minor_fixes

Minor fixes