updated for Xcode 4.6