merging 64-bit support