Merge pull request #79 from dlondero/2.2

Aggiornamenti