added 32/64 bit support