Merge pull request #250 from TheBlueMatt/macbuildfix