fixed complie error on iOS 7
Merge remote-tracking branch 'clowwindy/master'