changes from pull request 25