-Updated for Xcode5 / iOS7