add support for 32 & 64 bits archs