More changes in Terms
Merge pull request #180 from sergeyklay/term

More changes in Terms