(Manual) rebase of pull request #261 from aspezia
Merge pull request #264 from musella/topic_aspezia_ptOverM

pt/m categorization in CiC