[MOD] Changes
Merge branch '8-0-project' of github.com:oihane/avanzosc into 8-0-project
[MOD] Changes