Merge pull request #29 from am11/master

Tokens: Revamped BuildControlTree logic