Update for iOS 7 + Merge from master