fix on term model
Merge pull request #89 from camilin87/master

Merge last changes to my branch
some changes overall

Does not affect anybody
Merge pull request #90 from camilin87/kmoya-dev-branch

Kmoya dev branch merged to master branch