diff --git a/css/style.css b/css/style.css
index be455e1f0..564398013 100644
--- a/css/style.css
+++ b/css/style.css
@@ -16,6 +16,12 @@
 	font-weight: 500;
 	src: local('Fira Sans Medium'), url("../fonts/FiraSans-Medium.woff") format('woff');
 }
+@font-face {
+    font-family: 'fontello';
+    src: url('../fonts/fontello.svg?32953337#fontello') format('svg');
+    font-weight: normal;
+    font-style: normal;
+}
 
 body {
 	font-family: 'Fira Sans', "Helvetica Neue", Helvetica, Arial, sans-serif;
@@ -277,6 +283,34 @@ ul.laundry-list {
   outline: none;
 }
 
+ [class^="icon-"]:before, [class*=" icon-"]:before {
+  font-family: "fontello";
+  font-style: normal;
+  font-weight: normal;
+  speak: none;
+ 
+  display: inline-block;
+  text-decoration: inherit;
+  width: 1em;
+  margin-right: .2em;
+  text-align: center;
+  /* opacity: .8; */
+ 
+  /* For safety - reset parent styles, that can break glyph codes*/
+  font-variant: normal;
+  text-transform: none;
+     
+  /* fix buttons height, for twitter bootstrap */
+  line-height: 1em;
+ 
+  position: relative;
+  float: right;
+  font-size: 120%;
+ 
+}
+ 
+.icon-link-ext:before { content: '\e800'; } /* '' */
+
 #result {
   background-color: #E2EEF6;
   margin-top: 10px;
diff --git a/fonts/fontello.svg b/fonts/fontello.svg
new file mode 100644
index 000000000..58293ec65
--- /dev/null
+++ b/fonts/fontello.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg">
+<metadata>Copyright (C) 2014 by original authors @ fontello.com</metadata>
+<defs>
+<font id="fontello" horiz-adv-x="1000" >
+<font-face font-family="fontello" font-weight="400" font-stretch="normal" units-per-em="1000" ascent="850" descent="-150" />
+<missing-glyph horiz-adv-x="1000" />
+<glyph glyph-name="link-ext" unicode="&#xe800;" d="m786 332v-178q0-67-47-114t-114-47h-464q-67 0-114 47t-47 114v464q0 66 47 113t114 48h393q7 0 12-5t5-13v-36q0-8-5-13t-12-5h-393q-37 0-63-26t-27-63v-464q0-37 27-63t63-27h464q37 0 63 27t26 63v178q0 8 5 13t13 5h36q8 0 13-5t5-13z m214 482v-285q0-15-11-26t-25-10-25 10l-98 99-364-364q-5-6-13-6t-13 6l-63 63q-6 6-6 13t6 13l364 364-99 98q-10 11-10 25t10 25 26 11h285q15 0 25-11t11-25z" horiz-adv-x="1000" />
+</font>
+</defs>
+</svg>
\ No newline at end of file
diff --git a/index.html b/index.html
index ef9bcdb9e..af86051b0 100644
--- a/index.html
+++ b/index.html
@@ -49,8 +49,8 @@ <h2>Featuring</h2>
           <div id="editor">// This code is editable and runnable!
 fn main() {
     // A simple integer calculator:
-    // `+` or `-` means add/sub by 1
-    // `*` or `/` means mul/div by 2
+    // `+` or `-` means add or subtract by 1
+    // `*` or `/` means multiply or divide by 2
 
     let program = "+ + * - /";
     let mut accumulator = 0;
@@ -65,17 +65,19 @@ <h2>Featuring</h2>
         }
     }
 
-  println!("The program \"{}\" calculates the value {}",
-           program, accumulator);
+    println!("The program \"{}\" calculates the value {}",
+              program, accumulator);
 }</div>
-          <div id="result"></div>
+          <div id="result">
+            <a id="playlink" onclick="f1()" href="http://play.rust-lang.org/"><i class="icon-link-ext"></i></a>
+          </div>
         </div>
         <div id="static-code">
 <pre class='rust'>
 <span class='kw'>fn</span> main() {
     <span class='comment'>// A simple integer calculator:
-    // `+` or `-` means add/sub by 1
-    // `*` or `/` means mul/div by 2</span>
+    // `+` or `-` means add or subtract by 1
+    // `*` or `/` means multiply or divide by 2</span>
 
     <span class='kw'>let</span> program = <span class='string'>"+ + * - /"</span>;
     <span class='kw'>let</span> <span class='kw'>mut</span> accumulator = <span class='number'>0</span>;
@@ -121,7 +123,7 @@ <h2>Featuring</h2>
 
       return os;
     }
-    
+
     var platform = detect_platform();
 
     var rec_package_name = "nightly";
@@ -149,7 +151,7 @@ <h2>Featuring</h2>
     var rec_dl_addy = "http://static.rust-lang.org/dist/" + rec_download_file;
     var rec_inst_link = document.getElementById("inst-link");
     rec_inst_link.setAttribute("href", rec_dl_addy);
-   
+
   </script>
   <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.1.3/ace.js"></script>
   <script type="text/javascript" src="http://cdnjs.cloudflare.com/ajax/libs/ace/1.1.3/mode-rust.js"></script>
diff --git a/js/editor.js b/js/editor.js
index 3b8eb8445..20ac75179 100644
--- a/js/editor.js
+++ b/js/editor.js
@@ -14,6 +14,7 @@ var editorDiv = document.getElementById("editor");
 var staticCode = document.getElementById("static-code");
 var runButton = document.getElementById("run-code");
 var resultDiv = document.getElementById("result");
+var playLink = document.getElementById("playlink");
 
 // Background colors for program result on success/error
 var successColor = "#E2EEF6";
@@ -121,10 +122,15 @@ function handleResult(statusCode, message) {
   }
 }
 
-// Called on successful program run
+// Called on successful program run: display output and link to playground
 function handleSuccess(message) {
   resultDiv.style.backgroundColor = successColor;
-  resultDiv.innerHTML = escapeHTML(message);
+  var program = encodeURIComponent(editor.getValue());
+  playLink.href = "http://play.rust-lang.org/?code=" + program + "&run=1"
+  // console.log(playLink.href);
+  resultDiv.innerHTML = '';        // clear resultDiv, then add
+  resultDiv.appendChild(playLink); // playLink icon and message
+  resultDiv.innerHTML += escapeHTML(message);
 }
 
 // Called when program run results in warning(s)
@@ -164,7 +170,12 @@ function handleProblem(message, problem) {
   }).join("<br />");
 
   // Setting message
-  resultDiv.innerHTML = cleanMessage;
+  var program = encodeURIComponent(editor.getValue());
+  playLink.href = "http://play.rust-lang.org/?code=" + program + "&run=1"
+  // console.log(playLink.href);
+  resultDiv.innerHTML = '';        // clear resultDiv, then add
+  resultDiv.appendChild(playLink); // playLink icon and error message
+  resultDiv.innerHTML += cleanMessage;
 
   // Highlighting the lines
   var ranges = parseProblems(lines);