Merge pull request #1 from gorhill/master

Update from original