diff --git a/README.md b/README.md
index 69ee0ff..df1bf06 100644
--- a/README.md
+++ b/README.md
@@ -26,11 +26,12 @@ General notes and suggestions for customizing So Simple Theme.
 ## Basic Setup for new Jekyll site
 
 1. [Install Jekyll](http://jekyllrb.com) and read through the documentation if you haven't already.
-2. Fork the [So Simple Theme repo](https://github.com/mmistakes/so-simple-theme/fork)
-3. Clone the repo you just forked.
-4. Edit `_config.yml` to personalize your site.
-5. Check out the sample posts in `_posts` to see examples for pulling in large feature images, assigning categories and tags, and other YAML data.
-6. Read the documentation below for further customization pointers and documentation.
+2. [Install Jekyll Extra - Kramdown](http://jekyllrb.com/docs/extras/#kramdown)
+3. Fork the [So Simple Theme repo](https://github.com/mmistakes/so-simple-theme/fork)
+4. Clone the repo you just forked.
+5. Edit `_config.yml` to personalize your site.
+6. Check out the sample posts in `_posts` to see examples for pulling in large feature images, assigning categories and tags, and other YAML data.
+7. Read the documentation below for further customization pointers and documentation.
 
 [Download the Theme](http://mmistakes.github.io/so-simple-theme)
 
diff --git a/_includes/navigation.html b/_includes/navigation.html
index 4958bfe..a5fc766 100644
--- a/_includes/navigation.html
+++ b/_includes/navigation.html
@@ -27,14 +27,18 @@
 </div><!-- ./search-wrapper -->{% endif %}
 
 {% if page.image.feature %}<header class="masthead">
-	<div class="wrap">
-		<a href="{{ site.url }}" class="site-logo" rel="home" title="{{ site.title }}"><img src="{{ site.url }}/images/{{ site.logo }}" width="200" height="200" alt="{{ site.title }} logo" class="animated bounceInDown"></a>
-	</div>
+	{% if site.logo != null %}
+		<div class="wrap">
+			<a href="{{ site.url }}" class="site-logo" rel="home" title="{{ site.title }}"><img src="{{ site.url }}/images/{{ site.logo }}" width="200" height="200" alt="{{ site.title }} logo" class="animated bounceInDown"></a>
+		</div>
+	{% endif %}
 </header><!-- /.masthead -->
 {% else %}<header class="masthead">
 	<div class="wrap">
-		<a href="{{ site.url }}" class="site-logo" rel="home" title="{{ site.title }}"><img src="{{ site.url }}/images/{{ site.logo }}" width="200" height="200" alt="{{ site.title }} logo" class="animated fadeInUp"></a>
-		<h1 class="site-title animated fadeIn"><a href="{{ site.url }}">{{ site.title }}</a></h1>
+        {% if site.logo != null %}
+    		<a href="{{ site.url }}" class="site-logo" rel="home" title="{{ site.title }}"><img src="{{ site.url }}/images/{{ site.logo }}" width="200" height="200" alt="{{ site.title }} logo" class="animated fadeInUp"></a>
+        {% endif %}
+        <h1 class="site-title animated fadeIn"><a href="{{ site.url }}">{{ site.title }}</a></h1>
 		<h2 class="site-description animated fadeIn" itemprop="description">{{ site.description }}</h2>
 	</div>
 </header><!-- /.masthead -->{% endif %}