Updates Windows project
Merge pull request #5277 from ricardoquesada/windows_project

Updates Windows project