Updated for Xcode6-Beta7

Fixed compile error with optionals to work in Beta 7