Merge branch 'release/v0.1.6' into develop
Minor change in paths and template names
new release
Merge branch 'release/v0.1.7'