Xd 2326

Support for Windows environment
Not sure I understand this change