merging in changies from pull request