Merge branch 'release-0.0.20' into develop
refactor template
Merge branch 'feature-templates' into develop
added template param
0.0.21
Merge branch 'release-0.0.21'