Merge pull request #40 from joseguerrero/development

Solucionando tickets #27 y #37