New additions to adapt
Merge branch 'master' of https://github.com/nmldiegues/tmf
Another variant