Merge pull request #1 from tooling/master

Update from original