Updated for Yosemite and Xcode 6