Addresses pull request #80