Merge pull request #1 from lfernandez148/hotfix

Second file
Merge pull request #2 from lfernandez148/master

Merge pull request #1 from lfernandez148/hotfix