Fix issue 16, proper template comments to appease `golint`.

Hello!

This should close issue 16.