Adjusted to work with Swift in Xcode 8 GM