Merge nbc-develop branch into master

I have been working on the nbc-develop branch for a while, and now is the time to merge it into the master branch. War is over. Peace. :christmas_tree: