Hopefully fixing issue #165
Fix #241
Merge pull request #242 from ilya-murzinov/Issue241

Fix #241
Merge pull request #221 from JakeGinnivan/Win32FindModelWindows

Hopefully fixing issue #165