Updated to compile with iOS 8.1 SDK