Added 64 bit support