Merge pull request #214 from svost/C4146