Further work on PR #208

See PR #208.