fixed header file
Merge branch 'ios8_support'