doing the same, but better
Merge pull request #13 from goncalvesjoao/master

doing the same, but better