Beginning 64-bit work
Added 64-bit support