Merge pull request #237 from wak-google/fix-build