Added support for cpu Architecture. Fixes #2