diff --git a/lib/fetch-template.js b/lib/fetch-template.js
index 5a89509..5b62aa3 100644
--- a/lib/fetch-template.js
+++ b/lib/fetch-template.js
@@ -26,45 +26,100 @@ class TemplateError extends Error {
  *
  * @param {string} path
  */
-const readFile = (path) => 
+const readFile = (path) =>
     new Promise((resolve, reject) => {
         fs.readFile(path, 'utf-8', (err, data) => {
             if (err) {
                 reject(new TemplateError(err));
                 return;
-            } 
+            }
             resolve(data);
         });
     });
 
+/**
+ * Returns the template path validating a exactly file or a directory
+ *
+ * @param  {String} templatesPath - TemplatesPath config
+ * @param  {String} pathname - Path name based on Request Object
+ *
+ * @return {Promise} Template Info object on success or TemplateError on fail
+ */
+const getTemplatePath = (templatesPath, pathname) =>
+    new Promise((resolve, reject) => {
+        fs.lstat(
+            templatesPath,
+            (err, data) => {
+                if (err) {
+                    return reject(new TemplateError(err));
+                }
+
+                let templateStat = {
+                    isFile: data.isFile()
+                };
+
+                if (templateStat.isFile) {
+                    templateStat.path = templatesPath;
+                } else {
+                    templateStat.path = factoryFilePath(templatesPath, pathname);
+                }
+
+                return resolve(templateStat);
+            }
+        );
+    });
+
+/**
+ * Returns pathname by request
+ *
+ * @param  {Object} request - Request Object
+ *
+ * @return {String} pathname
+ */
+const getPathName = (request) => url.parse(request.url, true).pathname;
+
+/**
+ * Factory the complete file path
+ *
+ * @param  {String} templatesPath - Templates dir path
+ * @param  {String} filename - file name without extension
+ *
+ * @return {String} complete file path
+ */
+const factoryFilePath = (templatesPath, filename) =>
+    `${path.join(templatesPath, filename)}.html`;
+
 /**
  * Fetches the template from File System
  *
  * @param {string} templatesPath - The path where the templates are stored
  * @param {function=} baseTemplateFn - Function that returns the Base template name for a given page
  */
-module.exports = (templatesPath, baseTemplateFn) => 
+module.exports = (templatesPath, baseTemplateFn) =>
     (request, parseTemplate) => {
-        const pathname = url.parse(request.url, true).pathname;
-        const templatePath = path.join(templatesPath, pathname) + '.html';
+        const pathname = getPathName(request);
 
-        return readFile(templatePath)
-            .then((baseTemplate) => {
-                if (typeof baseTemplateFn !== 'function') {
-                    return parseTemplate(baseTemplate);
-                }
+        return getTemplatePath(templatesPath, pathname)
+            .then((templateStat) => {
+                return readFile(templateStat.path)
+                    .then((baseTemplate) => {
+                        if (templateStat.isFile || typeof baseTemplateFn !== 'function') {
+                            return parseTemplate(baseTemplate);
+                        }
 
-                const templateName = baseTemplateFn(pathname);
-                if (!templateName) {
-                    return parseTemplate(baseTemplate);
-                }
+                        const templateName = baseTemplateFn(pathname);
+                        if (!templateName) {
+                            return parseTemplate(baseTemplate);
+                        }
 
-                const pageTemplate = baseTemplate;
-                const baseTemplatePath = path.join(templatesPath, templateName) + '.html';
-                return readFile(baseTemplatePath)
-                    .then((baseTemplate) => parseTemplate(baseTemplate, pageTemplate));
+                        const pageTemplate = baseTemplate;
+                        const baseTemplatePath = factoryFilePath(templatesPath, templateName);
+                        return readFile(baseTemplatePath)
+                            .then((baseTemplate) => parseTemplate(baseTemplate, pageTemplate));
+                    });
             });
     };
 
+
 module.exports.TEMPLATE_ERROR = TEMPLATE_ERROR;
 module.exports.TEMPLATE_NOT_FOUND = TEMPLATE_NOT_FOUND;