Updated for Mac OS X 10.8 and above.