Merge pull request #1 from neilgee/master

Update to new