Merge branch 'mask' into 'master'

adjustments to weighted mask

See merge request !4
2 jobs for master in 51 seconds (queued for 5 seconds)