Properly detect architecture.
Merge pull request #17 from ryanpetrello/master

Properly detect architecture.