Minor fixes
Merge pull request #54 from johngian/minor-fixes

Minor fixes