Ensure that the CLI tool also supports windows
Ensure that the CLI tool also supports windows