Merge branch 'ff/avl-tree'