Update comments template and style

Fix #18
Merge branch 'local'