little change
Merge remote-tracking branch 'origin'
iOS7兼容