Fixes #200
Merge pull request #202 from google/200

Fixes #200
Updated lastest changes from upstream