Windows support (8/31)

Windows support