Merge pull request #8 from angerman/feature/add-more-archs