Merge pull request #220 from svost/C4101