Merge branch 'improveNBH' into 'master'

Improve nbh

See merge request !43
2 jobs for master in 1 minute and 13 seconds (queued for 3 seconds)