Fix for Issue #74 (branch rebased)

I tried “rebase” and made the branch an offspring of public/1.10.x. Looks better now…