Merge pull request #2 from tbennun/master

Fix x64/Debug build on MSVS