Pull Request #136 changes

Edited to match PR #136 and minor translation changes.
Merge pull request #137 from angelochiello/master

Pull Request #136 changes in Italian file