Fixed ##38
Merge branch 'dev' of github.com:brunomperes/TeamE-semester2 into dev