Merge pull request #45 from richo/bugs/match_arch

Correctly extract arch on platforms where architecure().name() fails