Improve tree generation.
Merge branch 'master' of git://github.com/trbecker/comp-2014-1