Added 32bit support