Refactoring
Merge pull request #1 from pcelta/master

Refactored