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