Minor fixes
Merge pull request #183 from GrahamCampbell/fixes

Minor Fixes