Minor fixes
Merge pull request #2 from rmcdole/master

Minor fixes