Fixing the refactorings needed for merge # 50
Merge pull request #51 from mateuscomp/master

Fixing the refactorings needed for merge # 50