Merge pull request #1 from j-leadbetter/master

Update to new