Small, but essential, changes
Merge pull request #584 from backslashed/gh-pages

Improved template rendering and suggestion [no conflict]