Merge pull request #44 from jneira/fix-win-tests