Merge pull request #18 from nicoriga/master

merge da master a nico1