Fixed delimit mate previous commit
Merge branch 'master' into work