Added 32 bit support