Merge branch 'DanielNavia/master'
Merge pull request #5 from hilarionq/master

De 2 a 12