Added support for OS X 10.8 and 10.9