Update for xCode 6.1 and iOS8.1