arregla: #22
Merge branch 'master' into desarrollo
Merge branch 'desarrollo' into fix-locuras-insertar-a