Add ios8 support
Merge branch 'ios8'