Updated for Mac OS X Mavericks