Merge pull request #82 from rupnikj/TStr

merged and some cleaning
cleaning