Fixes and formatting
Merge branch 'master' into feat/template
Merge branch 'master' into feat/template
v0.3.3