made ready for XCode 6