more adjustments
Merge pull request #6 from helmuthb/master

more adjustments