added OSX support