Making small changes to pull request #2