Merge branch 'release/v1.0' into develop
Merge pull request #1 from AlfonsoMoreno/develop

Merge branch 'release/v1.0' into develop