Added support for Windows (3)