Refactoring
Merge branch 'master' of https://github.com/gedsimon/ai-iscte.git
several changes