revise using mix-in in bintrees
Merge branch 'dev'