Merge pull request #689 from seanpaultaylor/next

Next
Added fixes for XCode