some small fixes
Merge pull request #54 from jlipps/master

small fixes