Fix #659 Tuto + #661 Adapt code
Merge branch 'master' of github.com:Heigvd/Wegas