Merge pull request #1 from google/master

sync with master