Solve conflicts
Merge pull request #4 from jlbellido/fran-master-conflict

Solve conflicts