Optimisation on OSSE
Merge pull request #388 from emmanuel-keller/master

Optimisation on OSSE