Merge pull request #153 from ctiller/windows-fixes

Windows fixes