Update OSX compatibility configuration
Merge pull request #592 from christopho/osx_compatibility

Update OSX compatibility configuration