small fixes
Merge pull request #6 from lewenhagen/master

small fixes