diff --git a/lib/core/GridBlock.js b/lib/core/GridBlock.js
index a3f34669f6..e8a800f757 100755
--- a/lib/core/GridBlock.js
+++ b/lib/core/GridBlock.js
@@ -29,11 +29,11 @@ class GridBlock extends React.Component {
 
     const topLeftImage =
       (block.imageAlign === "top" || block.imageAlign === "left") &&
-      this.renderBlockImage(block.image);
+      this.renderBlockImage(block.image, block.imageLink);
 
     const bottomRightImage =
       (block.imageAlign === "bottom" || block.imageAlign === "right") &&
-      this.renderBlockImage(block.image);
+      this.renderBlockImage(block.image, block.imageLink);
 
     return (
       <div className={blockClasses} key={block.title}>
@@ -49,13 +49,23 @@ class GridBlock extends React.Component {
     );
   }
 
-  renderBlockImage(image) {
+  renderBlockImage(image, imageLink) {
     if (image) {
-      return (
-        <div className="blockImage">
-          <img src={image} />
-        </div>
-      );
+      if (imageLink) {
+        return (
+          <div className="blockImage">
+            <a href={imageLink}>
+              <img src={image} />
+            </a>
+          </div>
+        );
+      } else {
+        return (
+          <div className="blockImage">
+            <img src={image} />
+          </div>
+        );
+      }
     } else {
       return null;
     }
@@ -65,7 +75,9 @@ class GridBlock extends React.Component {
     if (title) {
       return (
         <h2>
-          <Marked>{title}</Marked>
+          <Marked>
+            {title}
+          </Marked>
         </h2>
       );
     } else {
diff --git a/package.json b/package.json
index 347561b5d7..3563f659c1 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,7 @@
     "shelljs": "^0.7.8"
   },
   "name": "docusaurus",
-  "version": "1.0.0-alpha.26",
+  "version": "1.0.0-alpha.27",
   "bin": {
     "docusaurus-start": "./lib/start-server.js",
     "docusaurus-build": "./lib/build-files.js",