Merge pull request #236 from wak-google/fix-lib