fixes
Merge pull request #1 from lewenhagen/master

fixes