diff --git a/node_modules/jsdoc/tag.js b/node_modules/jsdoc/tag.js
index c2173b53..d42500b4 100644
--- a/node_modules/jsdoc/tag.js
+++ b/node_modules/jsdoc/tag.js
@@ -107,8 +107,9 @@
 	
 	/**
 		Parse the parameter name and parameter desc from the tag text.
-		@private
+		@inner
 		@method parseParamText
+		@memberof module:jsdoc/tag
 		@param {string} tagText
 		@returns {Array.<string, string, boolean, boolean>} [pname, pdesc, poptional, pdefault].
 	 */
diff --git a/templates/default/publish.js b/templates/default/publish.js
index 2b360c73..a66011c7 100644
--- a/templates/default/publish.js
+++ b/templates/default/publish.js
@@ -220,6 +220,7 @@
             
             nav = nav + '</ul>';
         }
+
         var namespaceNames = data.get( data.find({kind: 'namespace'}) );
         if (namespaceNames.length) {
             nav = nav + '<h3>Namespaces</h3><ul>';
@@ -230,17 +231,25 @@
             
             nav = nav + '</ul>';
         }
+
         var classNames = data.get( data.find({kind: 'class'}) );
         if (classNames.length) {
             nav = nav + '<h3>Classes</h3><ul>';
             classNames.forEach(function(c) {
-                if ( !seen.hasOwnProperty(c.longname) ) nav += '<li>'+linkto(c.longname, c.name)+'</li>';
+                var moduleSameName = data.get( data.find({kind: 'module', longname: c.longname}) );
+                if (moduleSameName) {
+                    c.name = c.name.replace('module:', 'require(')+')';
+                    moduleSameName[0].module = c;
+                }
+                
+                if (!seen.hasOwnProperty(c.longname) ) nav += '<li>'+linkto(c.longname, c.name)+'</li>';
                 seen[c.longname] = true;
             });
             
             nav = nav + '</ul>';
         }
-        
+//console.log('classNames', classNames);
+
         var globalNames = data.get( data.find({kind: ['property', 'function'], 'memberof': {'isUndefined': true}}) );
 
         if (globalNames.length) {
diff --git a/templates/default/tmpl/container.tmpl b/templates/default/tmpl/container.tmpl
index 8d289a73..edc6ebf1 100644
--- a/templates/default/tmpl/container.tmpl
+++ b/templates/default/tmpl/container.tmpl
@@ -50,6 +50,10 @@
 
 <article>    
     <?js
+    if (doc.kind === 'module' && doc.module) {
+        print(render('method.tmpl', doc.module));
+    }
+    
     if (doc.kind === 'class') {
         print(render('method.tmpl', doc));
     }
diff --git a/test/cases/moduletag3.js b/test/cases/moduletag3.js
new file mode 100644
index 00000000..d3b635b0
--- /dev/null
+++ b/test/cases/moduletag3.js
@@ -0,0 +1,20 @@
+/**
+@module foo/Photo/manager
+@desc Manage a collection of photos.
+*/
+
+/**
+Construct a new Photo manager
+@constructor module:foo/Photo/manager
+@param {String} collectionId The identifier of the managed collection.
+*/
+module.exports = function(collectionId) {
+
+    /**
+    @function module:foo/Photo/manager#getPhoto
+    @param {String} photoName
+    */
+    this.getPhoto = function() {}
+
+}
+