windows work
Merge pull request #1 from Trace0429/v3.1

windows work