code updated for Xcode 6.1