Separate into comments template
Merge branch 'master' of https://github.com/robinadr/hematite