Merge branch 'release/0.1.7' into develop
Add expandDistribution option
Increase version
Merge branch 'release/0.1.8'