Xd 2326

Support for Windows environment