Code

Merge branch 'aj/fix-read-tree-from-scratch'