Updated with support for OS X Yosemite (10.10)