fixes
merging other changes with pull request #202
bugfixes of #205 and #204
updates