Implement changes suggested by pull request 10