iOS8 suppport
Merge