Bugfixes
Merge branch 'master' of https://github.com/nbbl/nbbl.github.com