Add Mac OSX support