bonzanini Improve solution for q7, notebook 2.2 - Fix #4