New upstream version
Fixed architecture detection