Merge pull request #41 from letoh/fix-linux-build-2