modifica antes de function
Merge branch 'mapino' into iperich