Merge branch 'develop'
Version 1.0.0
Versione 1.0.2