Merge branch 'master' of github.com:pcouderc/mpri13 into inference
Merge branch 'inference' of github.com:pcouderc/mpri13