Added 64bit support