Merge pull request #216 from klausw-g/issue-424-b