Fix #244 & #246
Merge branch 'HEAD' of git@github.com:Heigvd/Wegas.git