Made changes according to review comments on pull request #85