New version with iOS7 support