Compilation fix for MSVC.
Merge pull request #159 from hernando/master

Compilation fix for MSVC.