Merge pull request #16 from fundor333/master

Merge pull request #15 from fundor333/terzaconsegna
Merge remote-tracking branch 'origin/terzaconsegna' into terzaconsegna