Now compiles clean with Mingw again. Closes #27