Changed tokyo from hash to B+ table
Merge commit 'cb6d2e70278ed400eb505e1141ea8d3eb627992c'