Merge resuelto

Se resuelve el Merge
Merge pull request #286 from QADM/v2

Merge resuelto