Windows fix
Merge pull request #548 from imapp-pl/pr-fixes

Windows fix