Merge pull request #36 from google/0.3.5

0.3.5