Implement json template
Merge origin/master