Add custom locations option
Version bump
Merge branch 'release/0.1.10' into develop