Addressed code review of pull request #2.