Added support for Mac