some fixes
Merge pull request #31 from lewenhagen/master

some fixes