Tagging classes
Merge branch 'master' of https://github.com/Animo6/tom-default