Fixes #19
Merge pull request #21 from ciudadanointeligente/dev

Fixes #19
Merge pull request #22 from ciudadanointeligente/master

Fixes #19