Updating code to work with the latest release of Xcode 6
Merging in the updates after building against the latest update to Xcode 6