logica flutuante
logica flutuante
Merge origin/master