Added support for OSX 10.10