Updating code to fix project and tests
Merge pull request #92 from ankurp/xcode-beta5-fixes

Updating code to fix project and tests