Fixed a couple of bugs
Merge pull request #18 from stcassedy/patch-7

Fixed a couple of bugs