Merged version
Merge branch 'clientside' of https://github.com/Plifou/QPURPISOG.git into clientside