Updated to work with OS X 10.10 Yosemite