Fixing the refactorings needed for merge #54
Merge pull request #55 from mateuscomp/master

Fixing the refactorings needed for merge #54