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

Minor fixes