diff --git a/templates/author.html b/templates/author.html
index aa7bda7..170ba83 100644
--- a/templates/author.html
+++ b/templates/author.html
@@ -30,8 +30,6 @@
             <a class="menu-button"><i class="ic ic-menu"></i> Menu</a>
           </span>
         </nav>
-        <h1 class="post-title">Articles by {{ author|capitalize }}</h1>
-        <span class="blog-description">Posts: {{ articles|count }}</span>
         {% if HEADER_COVER %}
             <div class="blog-cover cover" style="background-image: url('{{ HEADER_COVER }}')">            
         {% elif HEADER_COLOR %}
@@ -41,6 +39,39 @@
         {% endif %}
       </div>
     </header>
-{% endblock header %}
 
-<!-- TODO : author bio  -->
+    {% if AUTHORS_BIO and AUTHORS_BIO[author.name.lower()] != None %}
+    <section id="blog-author" class="has-cover" >
+        <div class="inner">
+            <aside class="post-author">
+                {% if AUTHORS_BIO[author.name.lower()].image %}
+                    <figure class="post-author-avatar">
+                        <img src="{{AUTHORS_BIO[author.name.lower()].image}}" alt="{{author.name | capitalize}}" />
+                    </figure>
+                {% endif %}
+                <div class="post-author-bio">
+                    <h4 class="post-author-name"><a href="{{ SITEURL }}/{{author.url}}">{{author.name | capitalize}}</a></h4>
+                    {% if AUTHORS_BIO[author.name.lower()].bio %}
+                        <p class="post-author-about">{{AUTHORS_BIO[author.name.lower()].bio}}</p>
+                    {% endif %}
+                    {% if AUTHORS_BIO[author.name.lower()].location %}
+                        <span class="post-author-location"><i class="ic ic-location"></i> {{AUTHORS_BIO[author.name.lower()].location}}</span>
+                    {% endif %}
+                    {% if AUTHORS_BIO[author.name.lower()].website %}
+                        <span class="post-author-website"><a href="{{AUTHORS_BIO[author.name.lower()].website}}"><i class="ic ic-link"></i> Website</a></span>
+                    {% endif %}
+                    {% if AUTHORS_BIO[author.name.lower()].twitter %}
+                        <span class="post-author-twitter"><a target="_blank" href="https://twitter.com/{{AUTHORS_BIO[author.name.lower()].twitter}}"><i class="ic ic-twitter"></i> Twitter</a></span>
+                    {% endif %}
+                    {% if AUTHORS_BIO[author.name.lower()].facebook %}
+                        <span class="post-author-facebook"><a target="_blank" href="https://facebook.com/{{AUTHORS_BIO[author.name.lower()].facebook}}"><i class="ic ic-facebook"></i> Facebook</a></span>
+                    {% endif %}
+                        <span class="post-author-stats"><i class="ic ic-posts"></i> {{ articles|count }} {% if articles|count > 1 %} posts {% else %} post {% endif %}</span>
+                </div>
+                <div class="clear"></div>
+            </aside>
+        </div>
+    </section>
+    {% endif %} 
+
+{% endblock header %}
diff --git a/templates/authors.html b/templates/authors.html
index 5a55e5f..562387d 100644
--- a/templates/authors.html
+++ b/templates/authors.html
@@ -49,5 +49,3 @@
       {% endif %}
     {% endfor %}
 {% endblock content %}
-
-<!-- TODO : Author bio -->