Update to Run on Windows

Update to Run on Windows too