Merge pull request #238 from bastih/master

Replace NULL with nullptr
Remove currently unused csb_tree