Updated file for more modern syntax (And so it will build in Xcode 6)