Merge pull request #12 from gaillard/master

little build fixes.