merged osx/darwin support