Updated for Xcode6-Beta7

Fixed compiler error with optionals to work in Beta 7