minor fixes
Merge pull request #36 from fieg/minor-fixes

minor fixes