Updated and tested with OS X Mavericks