Merge pull request #1 from francarl/master

merge da francarlo