James - merging in pull request