Merge pull request #5 from E-Mobility/arch-check