edits for pull request #2