Merge branch 'hotfix/exos#5'
Merge branch 'develop'
Merge branch 'develop'
fixing and refactoring
Mergeo actualizaciones hechas por Aza