Merge pull request #76 from jneira/fix-win-hang