Updated for Xcode 8.1