Minor fixes
Merge pull request #4 from eschmann/bugfix/tidyup

Minor fixes