diff --git a/_config.yml b/_config.yml
index 1719bd4..2a8f0b3 100644
--- a/_config.yml
+++ b/_config.yml
@@ -75,13 +75,15 @@ defaults:
     values:
       show_metadata: true 	# Show metadata beneath all pages
       sidebar: "" 		# Possible values › left, right › by default there will be no sidebar
+      comments: false
   -
     scope:
-      path: "" 				
+      path: ""        
       type: "posts"
     values:
-      show_metadata: true 	# Show metadata beneath all posts
-      sidebar: "" 		# Possible values › left, right › by default there will be no sidebar
+      show_metadata: true   # Show metadata beneath all posts
+      sidebar: ""     # Possible values › left, right › by default there will be no sidebar
+      comments: false
 
 
 
@@ -151,3 +153,12 @@ og_description:                     "Feeling Responsive is built on the fabulous
 #  Open _data/socialmedia.yml to adjust the left and right topbar navigation
 #
 
+
+#        ____  _                      
+#       / __ \(_)________ ___  _______
+#      / / / / / ___/ __ `/ / / / ___/
+#     / /_/ / (__  ) /_/ / /_/ (__  ) 
+#    /_____/_/____/\__, /\__,_/____/  
+#                    /_/              
+
+disqus_shortname: feelingresponsive
diff --git a/_includes/comments.html b/_includes/comments.html
new file mode 100644
index 0000000..cdc4cbd
--- /dev/null
+++ b/_includes/comments.html
@@ -0,0 +1,20 @@
+			{% if page.comments %}
+				<h3 class="t60">{{ site.data.language.comments_headline }}</h3>
+			
+			    <div id="disqus_thread"></div>
+			    <script type="text/javascript">
+			        /* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
+			        var disqus_shortname = '{{ disqus_shortname }}'; 
+			        var disqus_identifier = '{{ page.permalink }}';
+
+			        /* * * DON'T EDIT BELOW THIS LINE * * */
+			        (function() {
+			            var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+			            dsq.src = '//' + disqus_shortname + '.disqus.com/embed.js';
+			            (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+			        })();
+			    </script>
+			    <noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
+			{% endif %}
+
+
diff --git a/_layouts/page.html b/_layouts/page.html
index 573f8e9..f76f3cc 100644
--- a/_layouts/page.html
+++ b/_layouts/page.html
@@ -36,6 +36,10 @@ format: post
 			{% if page.show_metadata == true %}
 			{% include meta_information.html %}
 			{% endif %}
+
+			{% if page.comments == true %}
+			{% include comments.html %}
+			{% endif %}
 		</article>
 	</div><!-- /.medium-8.columns -->
 
diff --git a/_posts/design/2015-11-15-comments.md b/_posts/design/2015-11-15-comments.md
new file mode 100644
index 0000000..f625c89
--- /dev/null
+++ b/_posts/design/2015-11-15-comments.md
@@ -0,0 +1,20 @@
+---
+layout: page
+subheadline: "Discussion"
+title: "Now with Comments!"
+teaser: "For a blog you need comments. Like all those other jekyll themes we baked in Disqus. It's easy to set, it works and makes a static jekyll blog more dynamic."
+header:
+    image_fullwidth: "header_typewriter.jpg"
+    credit: Image by Florian Klauer
+    url: "http://florianklauer.de/"
+image:
+    thumb:  typewriter_thumb.jpg
+    homepage: homepage_typewriter.jpg
+categories:
+    - design
+comments: true
+show_metadata: false
+---
+If you want to use Disqus-Comments with *Feeling Responsive*, just open `config.yml` and add your `disqus_shortname`. [More on how to use Disqus ›](https://disqus.com/websites/)
+
+By default comments are turned off. You can customize the default behaviour in `config.yml`. To **turn on comments** just add `comments: true` to front matter using the page layout `layout: page`.
\ No newline at end of file
diff --git a/_posts/design/2015-11-16-typography.md b/_posts/design/2015-11-16-typography.md
index 8506f47..27b18b4 100755
--- a/_posts/design/2015-11-16-typography.md
+++ b/_posts/design/2015-11-16-typography.md
@@ -1,6 +1,6 @@
 ---
 layout: page-fullwidth
-title: "Wonderful   Typography"
+title: "Wonderful Typography"
 subheadline: "Reading Experience"
 meta_teaser: "Feeling Responsive uses Volkhov for headlines, Lato for everything else and if you are in need to show some code, it will be in Lucida Console."
 teaser: "<em>Feeling Responsive</em> uses <a href='https://www.google.com/fonts/specimen/Volkhov'>Volkhov</a> for headlines, <a href='https://www.google.com/fonts/specimen/Lato'>Lato</a> for everything else and if you are in need to show some code, it will be in <a href='http://www.microsoft.com/typography/fonts/family.aspx?FID=18'>Lucida Console</a> or <a href='http://en.wikipedia.org/wiki/Monaco_(typeface)'>Monaco</a>."
diff --git a/images/header_typewriter.jpg b/images/header_typewriter.jpg
new file mode 100644
index 0000000..437a495
Binary files /dev/null and b/images/header_typewriter.jpg differ
diff --git a/images/typewriter_thumb.jpg b/images/typewriter_thumb.jpg
new file mode 100644
index 0000000..bef7432
Binary files /dev/null and b/images/typewriter_thumb.jpg differ
diff --git a/pages/roadmap.md b/pages/roadmap.md
index 2d50827..fa47d32 100644
--- a/pages/roadmap.md
+++ b/pages/roadmap.md
@@ -11,7 +11,6 @@ permalink: "/roadmap/"
 ## ToDo
 
 * Additional [header]({{ site.url }}/headers/) with text
-* Disqus comments
 * Google AdSense ads
 * Produce an introduction video to showcase *Feeling Responsive*
 * [Submit *Feeling Responsive* to jekyllthemes.org](http://jekyllthemes.org/)
@@ -22,6 +21,7 @@ permalink: "/roadmap/"
 
 ## Done
 
+* <s>Disqus comments</s>
 * <s>Rework `list-entries.html` › now language ready</s>
 * [<s>Create custom 404.html-webpage</s>](https://help.github.com/articles/custom-404-pages/)
 * [<s>Add simple search box with Google</s>](http://truongtx.me/2012/12/28/jekyll-create-simple-search-box/)