Merge pull request #195 from trecouvr/POSS3

Update POSS3
Merge branch 'master' of github.com:trecouvr/server into POSS3