Updates from pull request