Replacement for pull request #95

Replacement for pull request #95