diff --git a/js/WikiStore.js b/js/WikiStore.js
index d3ca25b07..4d1ebd304 100755
--- a/js/WikiStore.js
+++ b/js/WikiStore.js
@@ -349,7 +349,7 @@ WikiStore.prototype.renderTiddler = function(targetType,title,asTitle,options) {
 			return {};
 		});
 	if(tiddler) {
-		if(asTitle) {
+		if(asTitle && asTitle !== title) {
 			var asTiddler = this.getTiddler(asTitle);
 			return stitcher("div",{
 				"data-tw-render-tiddler": title,
diff --git a/js/macros/tiddler.js b/js/macros/tiddler.js
index e78818640..4ebdf304a 100644
--- a/js/macros/tiddler.js
+++ b/js/macros/tiddler.js
@@ -49,23 +49,38 @@ exports.macro = {
 	types: ["text/html","text/plain"],
 	cascadeParams: true, // Cascade names of named parameters to following anonymous parameters
 	params: {
-		target: {byName: "default", type: "tiddler", optional: false},
+		target: {byName: "default", type: "tiddler", optional: true},
+		template: {byName: true, type: "tiddler", optional: true},
 		"with": {byName: true, type: "text", optional: true, dependentAll: true}
 	},
 	handler: function(type,tiddler,store,params) {
+		var renderTitle = params.template,
+			renderAs = params.target;
+		// Slightly bewildering logic to sort out the optional parameters
+		if(renderAs === undefined) {
+			if(renderTitle === undefined) {
+				return "";
+			} else {
+				renderAs = tiddler.title;
+			}
+		} else {
+			if(renderTitle === undefined) {
+				renderTitle = renderAs;
+			}
+		}
 		if(params["with"]) {
 			// Parameterised transclusion
-			var targetTiddler = store.getTiddler(params.target),
+			var targetTiddler = store.getTiddler(renderTitle),
 				text = targetTiddler.text;
 			var withTokens = [params["with"]];
 			for(var t=0; t<withTokens.length; t++) {
 				var placeholderRegExp = new RegExp("\\$"+(t+1),"mg");
 				text = text.replace(placeholderRegExp,withTokens[t]);
 			}
-			return store.renderText(targetTiddler.type,text,type,params.target);
+			return store.renderText(targetTiddler.type,text,type,renderAs);
 		} else {
 			// There's no parameterisation, so we can just render the target tiddler directly
-			return store.renderTiddler(type,params.target);
+			return store.renderTiddler(type,renderTitle,renderAs);
 		}
 	}
 };
diff --git a/test/wikitests/EighthTiddler.html b/test/wikitests/EighthTiddler.html
new file mode 100644
index 000000000..9f5c8488a
--- /dev/null
+++ b/test/wikitests/EighthTiddler.html
@@ -0,0 +1 @@
+<div data-tw-render-tiddler='EighthTiddler'><div data-tw-macro='tiddler' data-tw-render-step='1'><div data-tw-render-tiddler='SixthTiddler'><div data-tw-macro='view' data-tw-render-step='1'>SixthTiddler</div><br><div data-tw-macro='view' data-tw-render-step='2'>11 February 2011</div><br><div data-tw-macro='view' data-tw-render-step='3'><a href='Jermolene' class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-missing'>Jermolene</a></div><br></div></div><br><div data-tw-macro='tiddler' data-tw-render-step='2'><div data-tw-render-tiddler='SixthTiddler'><div data-tw-macro='view' data-tw-render-step='1'>SixthTiddler</div><br><div data-tw-macro='view' data-tw-render-step='2'>11 February 2011</div><br><div data-tw-macro='view' data-tw-render-step='3'><a href='Jermolene' class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-missing'>Jermolene</a></div><br></div></div><br><div data-tw-macro='tiddler' data-tw-render-step='3'><div data-tw-render-tiddler='SixthTiddler' data-tw-render-as='EighthTiddler'><div data-tw-macro='view' data-tw-render-step='1'>EighthTiddler</div><br><div data-tw-macro='view' data-tw-render-step='2'></div><br><div data-tw-macro='view' data-tw-render-step='3'></div><br></div></div><br><div data-tw-macro='tiddler' data-tw-render-step='4'><div data-tw-render-tiddler='SixthTiddler' data-tw-render-as='FirstTiddler'><div data-tw-macro='view' data-tw-render-step='1'>FirstTiddler</div><br><div data-tw-macro='view' data-tw-render-step='2'></div><br><div data-tw-macro='view' data-tw-render-step='3'></div><br></div></div><br></div>
\ No newline at end of file
diff --git a/test/wikitests/EighthTiddler.tid b/test/wikitests/EighthTiddler.tid
new file mode 100644
index 000000000..8e07e3a2c
--- /dev/null
+++ b/test/wikitests/EighthTiddler.tid
@@ -0,0 +1,6 @@
+title: EighthTiddler
+
+<<tiddler SixthTiddler>>
+<<tiddler target:SixthTiddler>>
+<<tiddler template:SixthTiddler>>
+<<tiddler template:SixthTiddler target:FirstTiddler>>
diff --git a/test/wikitests/EighthTiddler.txt b/test/wikitests/EighthTiddler.txt
new file mode 100644
index 000000000..25ff931b0
--- /dev/null
+++ b/test/wikitests/EighthTiddler.txt
@@ -0,0 +1 @@
+SixthTiddler11 February 2011JermoleneSixthTiddler11 February 2011JermoleneEighthTiddlerFirstTiddler
\ No newline at end of file
diff --git a/test/wikitests/Fourth Tiddler.html b/test/wikitests/Fourth Tiddler.html
index 6bd2c4f21..32b13b93c 100644
--- a/test/wikitests/Fourth Tiddler.html	
+++ b/test/wikitests/Fourth Tiddler.html	
@@ -1 +1 @@
-<div data-tw-render-tiddler='Fourth Tiddler'>An image <div data-tw-macro='image' data-tw-render-step='1'><img href='Something.jpg'></div> and a $1 couple of &#xc7; &#199; &quot;HTML Entity&quot; and macro <div data-tw-macro='version' data-tw-render-step='2'>5.0.0</div></div>
\ No newline at end of file
+<div data-tw-render-tiddler='Fourth Tiddler'>A missing image <div data-tw-macro='image' data-tw-render-step='1'><img href='Something.jpg'></div> and a $1 couple of &#xc7; &#199; &quot;HTML Entity&quot;</div>
\ No newline at end of file
diff --git a/test/wikitests/Fourth Tiddler.tid b/test/wikitests/Fourth Tiddler.tid
index 3e03f7583..351f4c4e9 100644
--- a/test/wikitests/Fourth Tiddler.tid	
+++ b/test/wikitests/Fourth Tiddler.tid	
@@ -1,3 +1,3 @@
 title: Fourth Tiddler
 
-An image [img[Something.jpg]] and a $1 couple of &#xc7; &#199; &quot;HTML Entity&quot; and macro <<version>>
\ No newline at end of file
+A missing image [img[Something.jpg]] and a $1 couple of &#xc7; &#199; &quot;HTML Entity&quot;
\ No newline at end of file
diff --git a/test/wikitests/Fourth Tiddler.txt b/test/wikitests/Fourth Tiddler.txt
index fa95b0513..4bf86005c 100644
--- a/test/wikitests/Fourth Tiddler.txt	
+++ b/test/wikitests/Fourth Tiddler.txt	
@@ -1 +1 @@
-An image  and a $1 couple of Ç Ç "HTML Entity" and macro 5.0.0
\ No newline at end of file
+A missing image  and a $1 couple of Ç Ç "HTML Entity"
\ No newline at end of file
diff --git a/test/wikitests/SeventhTiddler.tid b/test/wikitests/SeventhTiddler.tid
index 58c3717eb..78f640612 100644
--- a/test/wikitests/SeventhTiddler.tid
+++ b/test/wikitests/SeventhTiddler.tid
@@ -5,7 +5,3 @@ title: SeventhTiddler
 <<echo {{tiddler.title}}>>
 
 <<echo {{"window"}}>>
-
-<<tiddler SixthTiddler>>
-
-<<list all>>
diff --git a/test/wikitests/SixthTiddler.html b/test/wikitests/SixthTiddler.html
index 982b5e41d..6fbfcaec5 100644
--- a/test/wikitests/SixthTiddler.html
+++ b/test/wikitests/SixthTiddler.html
@@ -1 +1 @@
-<div data-tw-render-tiddler='SixthTiddler'><div data-tw-macro='view' data-tw-render-step='1'>SixthTiddler</div><br><div data-tw-macro='view' data-tw-render-step='2'>11 February 2011</div><br><div data-tw-macro='view' data-tw-render-step='3'><a href='Jermolene' class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-missing'>Jermolene</a></div><br><div data-tw-macro='list' data-tw-render-step='4'><ul><li><div data-tw-macro='view' data-tw-render-step='1'><a href='Fifth Tiddler' class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-resolves'>Fifth Tiddler</a></div></li><li><div data-tw-macro='view' data-tw-render-step='1'><a href='FirstTiddler' class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-resolves'>FirstTiddler</a></div></li><li><div data-tw-macro='view' data-tw-render-step='1'><a href='Fourth Tiddler' class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-resolves'>Fourth Tiddler</a></div></li><li><div data-tw-macro='view' data-tw-render-step='1'><a href='SecondTiddler' class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-resolves'>SecondTiddler</a></div></li><li><div data-tw-macro='view' data-tw-render-step='1'><a href='SeventhTiddler' class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-resolves'>SeventhTiddler</a></div></li><li><div data-tw-macro='view' data-tw-render-step='1'><a href='SixthTiddler' class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-resolves'>SixthTiddler</a></div></li><li><div data-tw-macro='view' data-tw-render-step='1'><a href='ThirdTiddler' class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-resolves'>ThirdTiddler</a></div></li></ul></div><br></div>
\ No newline at end of file
+<div data-tw-render-tiddler='SixthTiddler'><div data-tw-macro='view' data-tw-render-step='1'>SixthTiddler</div><br><div data-tw-macro='view' data-tw-render-step='2'>11 February 2011</div><br><div data-tw-macro='view' data-tw-render-step='3'><a href='Jermolene' class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-missing'>Jermolene</a></div><br></div>
\ No newline at end of file
diff --git a/test/wikitests/SixthTiddler.txt b/test/wikitests/SixthTiddler.txt
index 77d4b9e5b..1b83787ec 100644
--- a/test/wikitests/SixthTiddler.txt
+++ b/test/wikitests/SixthTiddler.txt
@@ -1 +1 @@
-SixthTiddler11 February 2011JermoleneFifth TiddlerFirstTiddlerFourth TiddlerSecondTiddlerSeventhTiddlerSixthTiddlerThirdTiddler
\ No newline at end of file
+SixthTiddler11 February 2011Jermolene
\ No newline at end of file
diff --git a/test/wikitests/ThirdTiddler.html b/test/wikitests/ThirdTiddler.html
index 428019157..c9c8ed76b 100644
--- a/test/wikitests/ThirdTiddler.html
+++ b/test/wikitests/ThirdTiddler.html
@@ -1 +1 @@
-<div data-tw-render-tiddler='ThirdTiddler'>An explicit link <span data-tw-macro='link' data-tw-render-step='1'><a href='Fourth Tiddler' class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-resolves'>Fourth Tiddler</a></span> and <span data-tw-macro='link' data-tw-render-step='2'><a href='Fourth Tiddler' class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-resolves'>a pretty link</a></span> and a transclusion <div data-tw-macro='tiddler' data-tw-render-step='3'>An image <div data-tw-macro='image' data-tw-render-step='1'><img href='Something.jpg'></div> and a Stringy couple of &#xc7; &#199; &quot;HTML Entity&quot; and macro <div data-tw-macro='version' data-tw-render-step='2'>5.0.0</div></div><br><br><div data-tw-macro='image' data-tw-render-step='4'><img href='http://placehold.it/350x150'></div><br></div>
\ No newline at end of file
+<div data-tw-render-tiddler='ThirdTiddler'>An explicit link <span data-tw-macro='link' data-tw-render-step='1'><a href='Fourth Tiddler' class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-resolves'>Fourth Tiddler</a></span> and <span data-tw-macro='link' data-tw-render-step='2'><a href='Fourth Tiddler' class='tw-tiddlylink tw-tiddlylink-internal tw-tiddlylink-resolves'>a pretty link</a></span> and a transclusion <div data-tw-macro='tiddler' data-tw-render-step='3'>A missing image <div data-tw-macro='image' data-tw-render-step='1'><img href='Something.jpg'></div> and a Stringy couple of &#xc7; &#199; &quot;HTML Entity&quot;</div><br><br><div data-tw-macro='image' data-tw-render-step='4'><img href='http://placehold.it/350x150'></div><br></div>
\ No newline at end of file
diff --git a/test/wikitests/ThirdTiddler.txt b/test/wikitests/ThirdTiddler.txt
index 1ffe635a0..8a4e9a1ff 100644
--- a/test/wikitests/ThirdTiddler.txt
+++ b/test/wikitests/ThirdTiddler.txt
@@ -1 +1 @@
-An explicit link Fourth Tiddler and a pretty link and a transclusion An image  and a Stringy couple of Ç Ç "HTML Entity" and macro 5.0.0
\ No newline at end of file
+An explicit link Fourth Tiddler and a pretty link and a transclusion A missing image  and a Stringy couple of Ç Ç "HTML Entity"
\ No newline at end of file