Changes per comments on pull request #34