diff --git a/assets/css/screen.css b/assets/css/screen.css
index 7e68a8c..346a725 100644
--- a/assets/css/screen.css
+++ b/assets/css/screen.css
@@ -723,6 +723,10 @@ margin on the iframe, cause it breaks stuff. */
     color: #9EABB3;
 }
 
+.author h4 a {
+    text-decoration: none;
+}
+
 .author-meta li {
     float: left;
     margin-left: 10px; /* space to the left of the bullet */
diff --git a/author.hbs b/author.hbs
new file mode 100644
index 0000000..720a889
--- /dev/null
+++ b/author.hbs
@@ -0,0 +1,39 @@
+{{!< default}}
+
+{{! The comment above "< default" means - insert everything in this file into
+    the {body} of the default.hbs template, which contains our header/footer. }}
+
+{{! Everything inside the #author tags pulls data from the author }}
+{{#author}}
+<header class="site-head" {{#if cover}}style="background-image: url({{cover}})"{{/if}}>
+    <div class="vertical">
+        <div class="site-head-content inner">
+            <h1 class="blog-title">{{name}}</h1>
+            <h2 class="blog-description">{{bio}}</h2>
+        </div>
+    </div>
+</header>
+{{/author}}
+
+{{! The main content area on the homepage }}
+<main class="content" role="main">
+
+    {{! Each post will be output using this markup }}
+    {{#foreach posts}}
+
+    <article class="{{post_class}}">
+        <header class="post-header">
+            <span class="post-meta"><time datetime="{{date format='YYYY-MM-DD'}}">{{date format="DD MMM YYYY"}}</time> {{tags prefix="on "}}</span>
+            <h2 class="post-title"><a href="{{url}}">{{{title}}}</a></h2>
+        </header>
+        <section class="post-excerpt">
+            <p>{{excerpt}}&hellip; <a class="read-more" href="{{url}}">&raquo;</a></p>
+        </section>
+    </article>
+
+    {{/foreach}}
+
+    {{!! After all the posts, we have the previous/next pagination links }}
+    {{pagination}}
+
+</main>
\ No newline at end of file
diff --git a/index.hbs b/index.hbs
index 3b9f70c..842a4d9 100644
--- a/index.hbs
+++ b/index.hbs
@@ -22,7 +22,7 @@
 
     <article class="{{post_class}}">
         <header class="post-header">
-            <span class="post-meta"><time datetime="{{date format='YYYY-MM-DD'}}">{{date format="DD MMM YYYY"}}</time> {{tags prefix="on "}}</span>
+            <span class="post-meta">{{author}}, <time datetime="{{date format='YYYY-MM-DD'}}">{{date format="DD MMM YYYY"}}</time> {{tags prefix="on "}}</span>
             <h2 class="post-title"><a href="{{url}}">{{{title}}}</a></h2>
         </header>
         <section class="post-excerpt">
diff --git a/package.json b/package.json
index b8b2680..79ef1d3 100644
--- a/package.json
+++ b/package.json
@@ -1,4 +1,4 @@
 {
   "name": "Casper",
-  "version": "0.9.3"
+  "version": "0.9.4"
 }
diff --git a/post.hbs b/post.hbs
index 13456a7..0ec51cc 100644
--- a/post.hbs
+++ b/post.hbs
@@ -21,7 +21,7 @@
         {{! Everything inside the #post tags pulls data from the post }}
         {{#post}}
 
-            <span class="post-meta"><time datetime="{{date format="YYYY-MM-DD"}}">{{date format='DD MMM YYYY'}}</time> {{tags prefix="on " separator=" | "}}</span>
+            <span class="post-meta">{{author}}, <time datetime="{{date format="YYYY-MM-DD"}}">{{date format='DD MMM YYYY'}}</time> {{tags prefix="on " separator=" | "}}</span>
 
             <h1 class="post-title">{{{title}}}</h1>
 
@@ -30,15 +30,21 @@
             </section>
 
             <footer class="post-footer">
-
+                
+                {{#author}}
                 <section class="author">
-                    <h4>{{author.name}}</h4>
-                    <p>{{author.bio}}</p>
-                    <ul class="author-meta clearfix">
-                        {{#if author.location}}<li>{{author.location}}</li>{{/if}}
-                        {{#if author.website}}<li><a href="{{author.website}}">{{author.website}}</a></li>{{/if}}
-                    </ul>
+                    <h4><a href="{{url}}">{{name}}</a></h4>
+                    {{#if bio}}
+                        <p>{{bio}}</p>
+                    {{else}}
+                        <p>Read <a href="{{url}}">more posts</a> by this author.</p>
+                    {{/if}}
+                    <div class="author-meta">
+                        {{#if location}}<span class="author-location icon-location">{{location}}</span>{{/if}}
+                        {{#if website}}<span class="author-link icon-link"><a href="{{website}}">{{website}}</a></span>{{/if}}
+                    </div>
                 </section>
+                {{/author}}
 
                 <section class="share">
                     <h4>Share this post</h4>