Resolve #295
Merge branch 'master' of https://github.com/Heigvd/Wegas