Merge pull request #68 from georgekang/master

avoid unexpected linker message "Conflicting CPU architectures 13/0"