Minor bug fixes.
Merge pull request #17 from thelukester92/master

Minor bug fixes.