Optimisation
Merge pull request #166 from zoic21/master

Optimisation