Fix Windows build
Merge pull request #839 from Monroe88/master

Fix Windows build