Updating for windows
Updating source to build on windows