issues 17-19
Merge pull request #24 from GDGSpainApps/issue_19_17

issues 17-19