Multi arch support bis

rebased version of #8