Address comments on pull request #21