Modified Runner to support windows