Added checks types for detect arch of OSX
Remove trailing space.
Merge branch 'gh-52-OSX-always-detected-as-i386' into stable
Merge branch 'stable'