Updated to modern Swift - Xcode 6.1