Fix windows build
Merge pull request #662 from ricnewton/master

Fix windows build