Mac build improvements
Merge pull request #4 from xtingray/mac-build-improvements

Mac build improvements