My contribution
Merge pull request #142 from zonetti/master

Merged Zonetti's contribution