Merge pull request #283 from Alexpux/mingw-w64-builds

Build fixes