fix
Merge https://github.com/shainen/nb