Merge pull request #2 from pedrogimenez/master

Refactor