Getting things to work on windows

This is a continuation of work done by @bebac for pull request #109