Issue#5+clean version of subtree

This branch is a clean version of subtree.