more adjustments
Merge pull request #7 from helmuthb/master

more adjustments