Fixes to run on windows.
Merge pull request #1 from elizabrock/master

Fixes to run on windows.