Fix #357
Merge branch 'master' of github.com:Heigvd/Wegas