Merge pull request #30 from google/0.3.2

0.3.2