Merge pull request #21 from jesseditson/master

iOS 8 compatibility