added 64bit support