MML: Added TPACluster

Merged commits and fixed author of #240