updates for Swift 1.1