Autodetection for OSX added