diff --git a/lib/docco.js b/lib/docco.js
index 4536d296..6dd8f511 100644
--- a/lib/docco.js
+++ b/lib/docco.js
@@ -39,7 +39,7 @@
         line = line.replace(language.comment_exit, '');
         line = line.replace(language.comment_enter, '');
         line = line.replace(language.comment_matcher, '');
-        line = line.replace(/^ +/, '');
+        line = line.replace(/^ *[\*] */, '');
         param = line.match(language.param);
         if (param) line = line.replace(param[0], '\n' + '<b>' + param[1] + '</b>');
         docs_text += line + '\n';
@@ -125,7 +125,7 @@
       symbol: '//',
       enter: '/\\*\+',
       exit: '\\*\+/',
-      param: /\* *@([a-zA-Z]+)/
+      param: /@([a-zA-Z]+)/
     },
     '.rb': {
       name: 'ruby',
diff --git a/src/docco.coffee b/src/docco.coffee
index 8dce8f04..27600444 100644
--- a/src/docco.coffee
+++ b/src/docco.coffee
@@ -97,7 +97,7 @@ parse = (source, code) ->
       line = line.replace(language.comment_exit, '')
       line = line.replace(language.comment_enter, '')
       line = line.replace(language.comment_matcher, '')
-      line = line.replace(/^ +/, '');
+      line = line.replace(/^ *[\*] */, '');
       param = line.match(language.param);
       if param
         line = line.replace(param[0], '\n' + '<b>' + param[1] + '</b>');
@@ -170,7 +170,7 @@ languages =
   '.coffee':
     name: 'coffee-script', symbol: '#'
   '.js':
-    name: 'javascript', symbol: '//', enter: '/\\*\+', exit: '\\*\+/', param: /\* *@([a-zA-Z]+)/
+    name: 'javascript', symbol: '//', enter: '/\\*\+', exit: '\\*\+/', param: /@([a-zA-Z]+)/
   '.rb':
     name: 'ruby', symbol: '#'
   '.py':