Minor changes.
Merge pull request #214 from bstell/master

Minor changes.