Fixed filesystem issue on windows
Merge remote-tracking branch 'hason/windows'