Added support for overriding the architecture (GitHub #9).