fix
Merge branch 'master' of https://github.com/shainen/nb
fix