update for Xcode 5(.1) & convert to ARC