minor fixes
Merge pull request #20 from bbarker/master

minor fixes