Merge pull request #36 from xeno-by/master

unification of trees, symbols and types