Merge pull request #16 from encuestame/1.5.x

1.5.x
Merge branch 'master' into 1.5.x
Merge branch '1.5.x'
Merge branch 'master' of github.com:encuestame/encuestame into 1.5.x