diff --git a/_includes/tags.html b/_includes/tags.html
new file mode 100644
index 0000000..89529b4
--- /dev/null
+++ b/_includes/tags.html
@@ -0,0 +1,6 @@
+{% for tag in page.tags %}
+    {% if tag != 'home' %}
+        {% capture tag_name %}{{ tag }}{% endcapture %}
+        <a href="/tag/#{{ tag_name }}" class="badge badge-pil"><code ><nobr>{{ tag_name }}</nobr></code></a>
+    {% endif %}
+{% endfor %}
diff --git a/_layouts/post.html b/_layouts/post.html
index cf83781..f558d21 100644
--- a/_layouts/post.html
+++ b/_layouts/post.html
@@ -410,6 +410,8 @@ <h3 class="author__name" itemprop="name">{{ author_details.name }}</h3>
 
         {{ content }}
 
+        {% include tags.html %}
+
         <hr>
 
         {% include social-share.html %}
diff --git a/assets/custom/scss/_tags.scss b/assets/custom/scss/_tags.scss
new file mode 100644
index 0000000..c272bfa
--- /dev/null
+++ b/assets/custom/scss/_tags.scss
@@ -0,0 +1,8 @@
+// for tags 
+
+.badge {
+    color: dimgrey;
+    padding: 10px;
+    font-family: "Courier New", Courier, monospace;
+    background-color: #e7e7e7;
+}
diff --git a/assets/custom/scss/custom.scss b/assets/custom/scss/custom.scss
index 2c91276..0f8b10f 100644
--- a/assets/custom/scss/custom.scss
+++ b/assets/custom/scss/custom.scss
@@ -2,3 +2,4 @@
 @import "social-share.scss";
 @import "markdown.scss";
 @import "pygments.scss";
+@import "tags.scss";
diff --git a/tag/index.html b/tag/index.html
new file mode 100644
index 0000000..78c8b52
--- /dev/null
+++ b/tag/index.html
@@ -0,0 +1,70 @@
+---
+layout: page
+title: Tags
+background: '/img/bg-post.jpg'
+---
+{% capture tags %}
+  {% for tag in site.tags %}
+    {{ tag[0] }}
+  {% endfor %}
+{% endcapture %}
+{% assign sortedtags = tags | split:' ' | sort %}
+
+{% for tag in sortedtags %}
+  {% if tag != 'home' %}
+  <a href="/tag/#{{ tag }}" class="badge badge-pil"><code ><nobr>{{ tag }}</nobr></code></a>
+  {% endif %}
+{% endfor %}
+<br> <br>
+
+{% for tag in sortedtags %}
+  {% if tag != 'home' %}
+  <h3><a href="/tag/#{{ tag }}" class="badge badge-pil" id="{{ tag }}"><code ><nobr>{{ tag }}</nobr></code></a></h3>
+  <ul>
+  {% for post in site.tags[tag] %}
+    
+      <article class="post-preview">
+        <a href="{{ post.url | prepend: site.baseurl | replace: '//', '/' }}">
+          <h2 class="post-title">{{ post.title }}</h2>
+          {% if post.subtitle %}
+          <h3 class="post-subtitle">{{ post.subtitle }}</h3>
+          {% else %}
+          <h3 class="post-subtitle">{{ post.excerpt | strip_html | truncatewords: 15 }}</h3>
+          {% endif %}
+        </a>
+
+        {% if post.author %}
+          {% assign authors = post.author %}
+        {% else %}
+          {% assign authors = site.author %}
+        {% endif %}
+
+        <p class="meta">Posted by
+          {% if authors.first %}
+            {% for author in authors %}
+              {% if post.author_url[forloop.index0] %}
+                <a target="_blank" href="{{ post.author_url[forloop.index0] }}">{{ author }}</a>{% unless forloop.last %},{% endunless %} 
+              {% else %}
+                {{ author }}{% unless forloop.last %},{% endunless %}
+              {% endif %}
+            {% endfor %}
+          {% else %}
+            {% if post.author_url %}
+              <a target="_blank" href="{{ post.author_url }}">{{ authors }}</a>
+            {% else %}
+              {{ authors }}
+            {% endif %}
+          {% endif %}
+          on {{ post.date | date: '%B %d, %Y' }} &middot; {% include read_time.html content=post.content %} &middot;
+          <a href="{{ post.url | prepend: site.baseurl | replace: '//', '/' }}#disqus_thread"></a>
+        </p>
+
+      </article>
+      <hr>
+      
+
+  {% endfor %}
+  </ul>
+  
+  {% endif %}
+{% endfor %}