Correct compilation problems with Visual Studio compiler
Merge pull request #1 from jacquesg/visual-studio

Correct compilation problems with Visual Studio compiler