ok persistenza
Merge origin/master