Fixed regression on Windows Platform
Merge pull request #35 from ukdtom/tommy-work

Fixed regression on Windows Platform