diff --git a/index.html b/index.html
index 7613823..d25c49a 100644
--- a/index.html
+++ b/index.html
@@ -234,8 +234,12 @@ h1{
 			// Parse Markdown links in the text
 			// credit: http://stackoverflow.com/a/9268827
 			var link = null;
-			while(link = d.text.match(/\[([^\]]+)\]\(([^)]+)\)/)) {
-				d.text = d.text.replace(link[0], "<a href='" + link[2] + "'>" + link[1] + "</a>");
+			while(link = d.text.match(/\[([^\]]+)\]\(([^)"]+)(?: \"([^\"]+)\")*\)/)) {
+				var link_attr = "";
+				if (link[3] !== undefined) {
+					link_attr = " title='" + link[3] + "'";
+				}
+				d.text = d.text.replace(link[0], "<a href='" + link[2] + "'" + link_attr + ">" + link[1] + "</a>");
 			}
 			
 			return '<div class="event" style="margin-left: ' + offset.toFixed(2) + 'px"><div class="time" style="width: ' + width.toFixed(2) + 'px"></div><b>' + d.time.title + '</b> ' + d.text + '&nbsp;&nbsp;</div>';
diff --git a/life.example.md b/life.example.md
index 6cfd821..f1285be 100644
--- a/life.example.md
+++ b/life.example.md
@@ -2,7 +2,7 @@
 ===============
 
 - 24/02/1955 Born
-- ~1968 Summer [job](http://en.wikipedia.org/wiki/Beach)!
+- ~1968 Summer [job](http://en.wikipedia.org/wiki/Beach "Job...")!
 - 03/1976 Built a computer
 - 01/04/1976 Started a company
 - 04/1976-2011 Whole bunch of interesting events
\ No newline at end of file