Changes requested for pull request #60