diff --git a/_src/_includes/entry_meta.html b/_src/_includes/entry_meta.html
index 0e56d001..adb9f1dc 100644
--- a/_src/_includes/entry_meta.html
+++ b/_src/_includes/entry_meta.html
@@ -1,16 +1,18 @@
 <footer class="entry-meta">
 	<p class="byline author vcard source-org">
-        <span class="by">by</span> <a class="fn" rel="author" href="/about/">{{ page.author }}</a>
+        <span class="by">by</span> <a class="fn" rel="author" href="/about/">
+			{% if page.author %}
+				{{ page.author }}
+			{% else %}
+				{{ site.author }}
+			{% endif %}
+		</a>
     </p>
 
-     <time class="pubdate" datetime="{{ page.date | date_to_xmlschema }}" pubdate{% if updated %} data-updated="true"{% endif %}>{{ page.date | timeago }}</time>
+     <time class="pubdate" datetime="{{ page.date | date_to_xmlschema }}" pubdate{% if page.updated %} data-updated="true"{% endif %}>{{ page.date | timeago }}</time>
 
     {% if page.updated %}
       <time class="updated" datetime="{{ page.updated | date_to_xmlschema }}">Updated {{ page.updated | timeago }}</time>
     {% endif %}
     
-    <!-- <p class="categories">
-        {{ page.categories | category_links }}
-    </p> -->
-    
 </footer>
\ No newline at end of file
diff --git a/_src/_includes/footer.html b/_src/_includes/footer.html
index b14023e9..9cc5c109 100644
--- a/_src/_includes/footer.html
+++ b/_src/_includes/footer.html
@@ -1,8 +1,11 @@
 <footer role="contentinfo" class="footer container">
 	
 	<div class="row">
-        <img class="avatar photo" src="/assets/img/avatar.jpeg" />
-        <p class="footer-description">Blog of designer &amp; developer <a href="/about">Matthias Kretschmann</a></p>
+		
+		<div class="vcard author">
+			<img class="avatar photo" src="/assets/img/avatar.jpeg" />
+	        <p class="footer-description">Blog of designer &amp; developer <a class="fn" rel="author" href="/about/">{{ site.author }}</a>
+	    </div>
 
         <aside class="subscribe">
             <h1 class="subscribe-title">Subscribe</h1>
diff --git a/_src/_includes/head.html b/_src/_includes/head.html
index 3ec1840d..52fa7748 100644
--- a/_src/_includes/head.html
+++ b/_src/_includes/head.html
@@ -29,7 +29,6 @@
     <meta charset="utf-8">
 
     <title>
-        
         {% if paginator.previous_page %}
             Page {{ paginator.page }} &brvbar; {{ page.title }}
         {% elsif page.path contains '_posts' %}
@@ -37,15 +36,14 @@
         {% else %}
             {{ page.title }} &brvbar; {{ site.description }}
         {% endif %}
-        
     </title>
     
     {% if page.description %}
         <meta name="description" content="{{ page.description }}">
     {% else %}
-        <meta name="description" content="{{ site.description }}" />
+        <meta name="description" content="{{ page.excerpt | strip_html | strip_newlines }}" />
     {% endif %}
-    <meta name="author" content="{{ site.author }}">
+    <meta name="author" content="{% if page.author %}{{ page.author }}{% else %}{{ site.author }}{% endif %}">
     
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
 	<meta name="HandheldFriendly" content="True">
diff --git a/_src/about/index.html b/_src/about/index.html
index 06cab9c1..ab526287 100644
--- a/_src/about/index.html
+++ b/_src/about/index.html
@@ -1,6 +1,7 @@
 ---
 layout: page
 title: About
+description: About this blog and the author
 ---
 
 <img class="avatar photo" src="/assets/img/avatar.jpeg" />