Incorporated comments to pull request #20