Mapper class added,
Merge branch 'master' of github.com:Fenoxo/sourceTiTS