diff --git a/server/lib/homer.js b/server/lib/homer.js
index 00af46a..4b02387 100644
--- a/server/lib/homer.js
+++ b/server/lib/homer.js
@@ -13,9 +13,7 @@ function homer(server)
 	server.on('newroom', (room) =>
 	{
 		const fileName =
-			path.join(
-				process.env.MEDIASOUP_HOMER_OUTPUT,
-				`${(new Date()).toISOString()}_${room.id}`);
+			path.join(process.env.MEDIASOUP_HOMER_OUTPUT);
 
 		const stream = fs.createWriteStream(fileName, { flags: 'a' });
 
diff --git a/server/router.js b/server/router.js
index 97da297..83e6ff5 100644
--- a/server/router.js
+++ b/server/router.js
@@ -158,19 +158,21 @@ const actions = {
       var resolvedBase = path.resolve('./public');
       var safeSuffix = path.normalize(req.url).replace(/^(\.\.[\/\\])+/, '');
       var fileLoc = path.join(resolvedBase, safeSuffix);
+			var headers = {};
 
-          var stream = fs.createReadStream(fileLoc);
+      var stream = fs.createReadStream(fileLoc);
 
-          // Handle non-existent file -> delivering index.html
-          stream.on('error', function(error) {
-  						stream = fs.createReadStream(path.resolve('./public/index.html'));
-              res.statusCode = 200;
-  		        stream.pipe(res);
-          });
-
-          // File exists, stream it to user
+      // Handle non-existent file -> delivering index.html
+      stream.on('error', function(error) {
+					stream = fs.createReadStream(path.resolve('./public/index.html'));
           res.statusCode = 200;
-          stream.pipe(res);
+	        stream.pipe(res);
+      });
+
+      // File exists, stream it to user
+			if (parsedUrl.pathname.indexOf('svg') === parsedUrl.pathname.length -3) {headers = {'Content-Type': 'image/svg+xml'}};
+			res.writeHead(200, headers);
+      stream.pipe(res);
     }
   },