Add Win64 support
Merge Win64 support