minor fixes
Merge pull request #142 from jpecht/master

minor fixes