more fixes
Merge pull request #1 from fanian/master

more fixes