small fixes
initial upload
Merge pull request #33 from lewenhagen/master

small fixes