Update for James
Merge pull request #6 from elliotgreenwood/master

Update for James