chore: Merges for iOS7 compatibility & podspec