Mod. jar
Merge branch 'master' of s2.iacobus.net:alejandro/ptmf