make work on ios8
Merge branch 'ios8_support'