Refactoring
Merge pull request #1 from hosmelq/master

Refactoring