Fix indent
Add some links and an example for templating
Merging