Compiles on Windows
Merge pull request #6525 from ricardoquesada/compiles_win

Compiles on Windows