Win64 enabled
merge