Updated to work on msys2 in Windows