Fixing Jesse's bugs
Merge pull request #53 from Jtfinlay/master

Fixing Jesse's bugs