Optimisation
Merge pull request #167 from zoic21/master

Optimisation