fixes
Merge pull request #55 from lewenhagen/master

fixes