Merge pull request #33 from Happy0/fix_build

Attempt to fix the build.