Updated for Xcode/Swift b7