fixed iOS 7 issues
Merge remote-tracking branch 'origin/master'