Merge pull request #224 from svost/C4800