Fixed #1, so tests now pass on windows.