test from NB
Merge GitHub/master