Add support for iOS simulator
Fix wrong macros name for x86_64 arch
Merge branch 'develop'

Add iOS Simulator support