Added 64bit and 32bit support