Merge pull request #39 from cocreature/fix-windows