Merge pull request #225 from svost/msvc-C4244