Various fixes
Merge branch 'master' of https://github.com/Longwelwind/ProjetInfo2014