Feature/ios7 support