Refactor
Merge pull request #5 from comarios/master

Refactor