some fixes
Merge pull request #173 from wgerlach/master

some minor fixes