Refactor nb

Gabriele Barni requested to merge refactor_nb into master

Merge request reports