v1.0 finalizada
Merge branch 'release/1.0' into develop