Merge pull request #7 from gamaral/master

Found a new bug on MSVC 64.