Merge pull request #1 from morgan-del/master

A customisable dmerge