Minor fixes
Merge pull request #4 from lachlanhunt/bug-002

Minor fixes