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

windows work