added 32-bit and 64-bit support