close #18
Merge branch '#18-Tree'