Added initial support for OSX