Minor changes
Merge pull request #215 from bstell/master

Minor changes