#126 Pequeño refactor.
Merge pull request #179 from jcarizza/master

#126 Pequeño refactor.