Merge pull request #25 from google/0.2.2

0.2.2