Windows support (26/31)

Windows support