Adding OSX Compatibility