Custom generated template
Merge branch 'gh-pages'