Added support for Windows environment