Improve nbh

Merged Christian Tischer requested to merge improveNBH into master

Merge request reports