Updated with OS X Mavericks support