Merge pull request #32 from igoryok-zp/diff_marked_fix