Merge pull request #42 from TeamBig/master

fix
Merge pull request #43 from TeamBig/master

legenda
Merge pull request #33 from francarl/master

merge da francarlo