In addition to #188

See pull request #188 for further information.