Added support for Mac OS X