Merge pull request #141 from greatwolf/master

Fixups for  Issue #140 Mingw support