Added support for Windows