Merge pull request #377 from tatsuhiro-t/fix-build-errors

Fix build errors