Updates for MacOS X build
Merge pull request #1 from CaptEmulation/master

Updates for MacOS X build