Merge pull request #32 from google/type-fixes