Custom template support
Merge branch 'v.0.4.0'