Fixed file name encoding issues for windows