Fix options name.
Fix checking BUILD_ARCHITECTURE.
Merge pull request #335 from Alexpux/develop

Develop