Merge pull request #210 from Alexpux/develop

Under MSYS2: