Added Mac OSX support