refactoring
Merge branch 'notebook' into ttb