Merge branch 'bugfixes' of git://github.com/jzalinger/nbites