Refactoring
Merge pull request #36 from fernandoacorreia/refactor

Refactoring