ios > 7 fix
Merge pull request #17 from jfnadeau/master

ios >= 7 fix