Fix compilation on Windows
Merge pull request #903 from melted/master

Fix compilation on Windows