Added some intrumentation to the btree. Needs to be finished.
Merge remote-tracking branch 'origin/master'