Merge pull request #172 from TheOneRing/fix_msvcx64