fixed CLI to support windows