closed #9

merged tree changes features