Added support for OS X 10.7+