Update to Run on Windows/Ubuntu

Update to Run on Windows/Ubuntu  too