Converted to ARC and iOS 7 support