fix overlapping of trees bug
Merge pull request #20 from adamreis/tree-overlap-hotfix

fix overlapping of trees bug
Incorporated fix for packing around trees into the refactoring