Merge pull request #21 from francarl/master

merge da francarlo
Fix varie
Merge pull request #29 from TeamBig/master

Fix risolte al 20-11-14 / 18:15