Minor fixes
Merge pull request #32 from jeffdavidgordon/master

Minor fixes