changes for windows
Merged