Merge pull request #2 from jyap808/osx_build_fixes