Remove ifdef for iOS 6 SDK #24
Update README.md
Fix typo
Resolved conflict