Implement feedback from pull request #10