Merge pull request #1225 from seanpaultaylor/next

Next
Fixed xcode warnings for MacOSX