Minor fixes
Merge pull request #48 from James-Dunn/patch-1

Minor fixes