Merge pull request #4 from hvr/pr/TSem-improvements