Merge pull request #210 from jwillemsen/jwi-ws32bmake