updated to fix ios7 warnings