See comments for pull request #51