Falta RDoc o yard
Merge branch 'desarrollo'