Merge pull request #3 from linuxbbq/master

merging
Merge pull request #4 from boccaperta-it/master

Merge pull request #3 from linuxbbq/master