Merge pull request #1 from google/master

Update from original