Merge pull request #1 from juleswhite/master

Update from original