Added support for MacOS