Updated for Yosemite and rMBP 2014