Incorporated comments from pull request #2