Merge pull request #9 from hetelek

Updated for iOS 7.1