Adding -m option to pick a triad based on the name of the aliroot directory
Merge branch 'master' into feature-date-amore