Merge pull request #25 from dianmorales/1.5.x

1.5.x
Merge pull request #26 from encuestame/1.5.x

Merge pull request #25 from dianmorales/1.5.x