Added support for OS X