diff --git a/.chglog/CHANGELOG.tpl.md b/.chglog/CHANGELOG.tpl.md
index a70d5d2..6c5207d 100755
--- a/.chglog/CHANGELOG.tpl.md
+++ b/.chglog/CHANGELOG.tpl.md
@@ -1,40 +1,42 @@
-{{ range .Versions }}
+{{- range .Versions }}
 <a name="{{ .Tag.Name }}"></a>
-## BlueMastoFeed {{ if .Tag.Previous }}[{{ .Tag.Name }}]({{ $.Info.RepositoryURL }}/compare/{{ .Tag.Previous.Name }}...{{ .Tag.Name }}){{ else }}{{ .Tag.Name }}{{ end }} ({{ datetime "2006-01-02" .Tag.Date }})
+## BlueMastoFeed {{ if .Tag.Previous }}[{{ .Tag.Name }}]({{ $.Info.RepositoryURL }}/compare/{{ .Tag.Previous.Name }}...{{ .Tag.Name }}){{ else }}{{ .Tag.Name }}{{ end }} - {{ datetime "2006-01-02" .Tag.Date }}
 
-### test
-
-{{ range .CommitGroups -}}
-### {{ .Title }}
-
-{{ range .Commits -}}
-* {{ if .Scope }}**{{ .Scope }}:** {{ end }}{{ .Subject }}
+{{ if .CommitGroups }}
+### Changes
+{{ range .CommitGroups }}
+#### {{ .Title }}
+{{ range .Commits }}
+- {{ if .Scope }}**{{ .Scope }}:** {{ end }}{{ .Subject }}  
+  {{- with .Hash }}[`{{ . | truncate 7 }}`]({{ $.Info.RepositoryURL }}/commit/{{ . }}){{ end }} by @{{ .Author.Name }}
+{{ end }}
 {{ end }}
-{{ end -}}
-
-{{- if .RevertCommits -}}
-### Reverts
-
-{{ range .RevertCommits -}}
-* {{ .Revert.Header }}
 {{ end }}
-{{ end -}}
 
-{{- if .MergeCommits -}}
+{{ if .MergeCommits }}
 ### Pull Requests
-
-{{ range .MergeCommits -}}
-* {{ .Header }}
+{{ range .MergeCommits }}
+- {{ .Header }}  
+  [`{{ .Hash | truncate 7 }}`]({{ $.Info.RepositoryURL }}/commit/{{ .Hash }}) by @{{ .Author.Name }}
+{{ end }}
 {{ end }}
-{{ end -}}
 
-{{- if .NoteGroups -}}
-{{ range .NoteGroups -}}
-### {{ .Title }}
+{{ if .RevertCommits }}
+### Reverts
+{{ range .RevertCommits }}
+- {{ .Revert.Header }}  
+  [`{{ .Hash | truncate 7 }}`]({{ $.Info.RepositoryURL }}/commit/{{ .Hash }}) by @{{ .Author.Name }}
+{{ end }}
+{{ end }}
 
+{{ if .NoteGroups }}
+### Notes
+{{ range .NoteGroups }}
+#### {{ .Title }}
 {{ range .Notes }}
-{{ .Body }}
+- {{ .Body }}
+{{ end }}
+{{ end }}
+{{ end }}
+
 {{ end }}
-{{ end -}}
-{{ end -}}
-{{ end -}}
\ No newline at end of file