merge master

file.contain bugfix for windows.