Fix Xcode 4 compatibility
Merge pull request #1263 from rivera-ernesto/fix_xcode4_compatibility

Fix Xcode 4 compatibility