Updated for Xcode 6 Beta 5 compatibility