minor changes
Merge pull request #1 from bketelsen/master

minor changes