Merge pull request #35 from google/0.3.4

rev to 0.3.4