Fixes #188
Merge pull request #189 from ciudadanointeligente/issue_188

Fixes #188
Merge pull request #190 from ciudadanointeligente/dev

Dev