Code

Merge branch 'jk/empty-tree'