phst Merge pull request #4 from eroux/fix-build