Updated some minor things
Merge branch 'master' of https://github.com/guidopaesani/Shouter.git