diff --git a/_includes/head.html b/_includes/head.html
index 99d19fc..178901e 100644
--- a/_includes/head.html
+++ b/_includes/head.html
@@ -10,7 +10,9 @@
 <meta name="twitter:image" content="{% if page.image.thumb %}{{ site.url }}/images/{{ page.image.thumb }}{% else %}{{ site.url }}/images/{{ site.logo }}{% endif %}">{% endif %}
 <meta name="twitter:title" content="{% if page.title %}{{ page.title }}{% else %}{{ site.title }}{% endif %}">
 <meta name="twitter:description" content="{% if page.description %}{{ page.description }}{% else %}{{ site.description }}{% endif %}">
-<meta name="twitter:creator" content="@{{ site.owner.twitter }}">{% endif %}
+<meta name="twitter:site" content="@{{ site.owner.twitter }}">
+{% if page.author.twitter %}<meta name="twitter:creator" content="@{{ page.author.twitter }}">{% endif %}
+{% endif %}
 
 <!-- Open Graph -->
 <meta property="og:locale" content="en_US">
diff --git a/_layouts/post.html b/_layouts/post.html
index 598c8fb..b855d9e 100644
--- a/_layouts/post.html
+++ b/_layouts/post.html
@@ -24,8 +24,13 @@
         {% endif %}
       </header>
       <footer class="entry-meta">
+        {% if page.author.name %}
+        <img src="{{ site.url }}/images/{{ page.author.avatar }}" alt="{{ page.author.name }} photo" class="author-photo">
+        <span class="author vcard">By <span class="fn">{{ page.author.name }}</span></span>
+        {% else %}
         <img src="{{ site.url }}/images/{{ site.owner.avatar }}" alt="{{ site.owner.name }} photo" class="author-photo">
         <span class="author vcard">By <span class="fn"><a href="{{ site.url }}/about/" title="About {{ site.owner.name }}">{{ site.owner.name }}</a></span></span>
+        {% endif %}
         <span class="entry-date date published"><time datetime="{{ page.date | date_to_xmlschema }}"><i class="icon-calendar-empty"></i> {{ page.date | date: "%B %d, %Y" }}</time></span>
         {% if page.modified %}<span class="entry-date date modified"><time datetime="{{ page.modified }}"><i class="icon-pencil"></i> {{ page.modified | date: "%B %d, %Y" }}</time></span>{% endif %}
         {% if site.disqus_shortname and page.comments %}<span class="entry-comments"><i class="icon-comment-alt"></i> <a href="#disqus_thread">Comment</a></span>{% endif %}
diff --git a/_posts/2014-06-19-author-override.md b/_posts/2014-06-19-author-override.md
new file mode 100644
index 0000000..6b95dac
--- /dev/null
+++ b/_posts/2014-06-19-author-override.md
@@ -0,0 +1,25 @@
+---
+layout: post
+title: "Override Author Byline Test Post"
+description: "An article to test overriding the default site author."
+category: articles
+tags: [sample post, readability, test]
+author:
+  name: Billy Rick
+  avatar: bio-photo-alt.jpg
+comments: true
+share: true
+---
+
+For those of you who may have content written by multiple authors on your site, here's a new feature I added to So Simple.
+
+Traditionally you would assign a global author for the entire site and those attributes would be used in all post bylines, social networking links in the footer, Twitter Cards, and Google Authorship. These `owner` variables still work the same way when set in your `config.yml`, but now if you add an author variable to a post's YAML front matter, you can override a post's author byline.
+
+Let's say we have an author Billy Rick --- he wrote this post and we want his name and photo to appear on the page instead of whoever the default site author is. To do so we'd add the following YAML front matter.
+
+``` yaml
+author:
+  name: Billy Rick
+  avatar: billy-photo.jpg    #place in /images
+  twitter: billyrick         #marked as a creator for Twitter Card links
+```
\ No newline at end of file
diff --git a/images/bio-photo-alt.jpg b/images/bio-photo-alt.jpg
new file mode 100644
index 0000000..af2a1ed
Binary files /dev/null and b/images/bio-photo-alt.jpg differ