Merge pull request #2102 from Nerei:compilatin_for_windows