Bug fixes

Fixing minor issues
Merge pull request #7 from chongtastic/master

Bug fixes