Merge branch 'improve_matching' into 'master'

Improve matching

See merge request julia.garriga/darfix!45
1 job for master in 2 minutes and 18 seconds (queued for 1 second)