Windows Build fix
Merge pull request #1492 from markbenvenuto/win_build_fix

Windows Build fix