Updated for iOS 8
Merge pull request #1 from zaxdo/patch-1

erge accidentally created branches