Refactor fase 5
Merge branch 'master' into martyn82