Solved issues 18 and 12
Merge pull request #22 from GDGSpainApps/issue_18_12

Solved issues 18 and 12