change on nb branch
Merge pull request #1 from cristianomatte/nb

change on nb branch