lineas 14-20
Merge pull request #3 from tommslar/master

lineas 14-20