diff --git a/layouts/_default/section.html b/layouts/_default/section.html
index a2fef0b..1955337 100644
--- a/layouts/_default/section.html
+++ b/layouts/_default/section.html
@@ -10,6 +10,7 @@
                 post-container">
 
          	{{ .Content }}
+                {{ partial "comments.html" . }}
 
             </div>
             <!-- Sidebar Container -->
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 274ca20..386cf9a 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -76,6 +76,7 @@
                     </a>
                     {{ end }}
                 </div>
+                {{ partial "comments.html" . }}
 
             </div>
             <!-- Sidebar Container -->
diff --git a/layouts/partials/comments.html b/layouts/partials/comments.html
new file mode 100644
index 0000000..a3760f3
--- /dev/null
+++ b/layouts/partials/comments.html
@@ -0,0 +1,19 @@
+{{ if .Site.Params.disqus_proxy }}
+<div id="disqus-comment"></div>
+<script src="{{ "js/iDisqus.js" | relURL }}"></script>
+<script>
+var disq = new iDisqus('disqus-comment', {
+    forum: '{{ .Site.DisqusShortname}}',
+    api: '{{ .Site.Params.disqus_proxy }}',
+	site: '{{ .Site.Params.disqus_site }}',
+    mode: 1,
+    timeout: 5000,
+    init: true
+});
+</script>
+{{ else if .Site.DisqusShortname }}
+<div id="disqus-comment"></div>
+{{ template "_internal/disqus.html" . }}
+{{ else if .Site.Params.Commento }}
+<div id="commento"></div>
+{{ end }}
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index cea0c9a..56184a2 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -91,6 +91,11 @@
     </script>
     <script type="text/javascript" src="{{"js/search.js" | relURL}}"></script>
 
+    {{ with .Site.Params.Commento }}
+    <!-- Commento JavaScript -->
+    <script defer src="{{ .scheme | default "https" }}://{{ .host }}/{{ .path | default "js/commento.js" }}"></script>
+    {{ end }}
+
     <!-- Custom JS -->
     {{ range .Site.Params.custom_js }}
     <script src="{{ . | absURL }}"></script>