optimisation
Merge branch 'release/0.1.7'