Updated for Xcode 5.1
Converted to ARC