diff --git a/bin/tools/doxyFilter b/bin/tools/doxyFilter
index b5e59a2370..2e370383e5 100755
--- a/bin/tools/doxyFilter
+++ b/bin/tools/doxyFilter
@@ -54,7 +54,8 @@ then
 #        ;;
     esac
 
-    awk -f $awkScript $1 | \
+    awk -f $WM_PROJECT_DIR/bin/tools/doxyFilter-table.awk $1 | \
+    awk -f $awkScript  | \
     sed -f $WM_PROJECT_DIR/bin/tools/doxyFilter.sed \
         -e s@%filePath%@$filePath@g \
         -e s@%fileName%@$fileName@g \
diff --git a/bin/tools/doxyFilter-table.awk b/bin/tools/doxyFilter-table.awk
new file mode 100644
index 0000000000..a8bc23bd90
--- /dev/null
+++ b/bin/tools/doxyFilter-table.awk
@@ -0,0 +1,100 @@
+BEGIN {
+    FS = "|";
+    data = "";
+    flag = 0;
+    firstRow = 0;
+}
+
+
+/\/table/ {
+    flag = 1;
+    firstRow = 1;
+    next;
+}
+
+
+/\/endtable/ {
+    if (data != "")
+    {
+        printf "<table class=\"OFTable\">\n";
+        printf data;
+        printf "</table>\n";
+    }
+
+    data = "";
+    flag = 0;
+    next;
+}
+
+
+/\/vartable/ {
+    flag = 2;
+    firstRow = 1;
+    next;
+}
+
+
+/\/endvartable/ {
+    if (data != "")
+    {
+        printf "<table border="0">\n";
+        printf data;
+        printf "</table>\n";
+    }
+
+    data = "";
+    flag = 0;
+    next;
+}
+
+
+{
+    if (flag > 0)
+    {
+        data = (data "<tr>");
+        if (flag == 1)
+        {
+            for (i = 0; i <= NF; i++)
+            {
+                if ((i != 0) && (firstRow == 1))
+                {
+                    data = (data "    <th align=\"center\"><b>"$i"</b></th>\n");
+                }
+                else
+                {
+                    if (i == 1)
+                    {
+                        data = (data "    <td>\\c "$i"</td>\n");
+                    }
+                    else if (i > 1)
+                    {
+                        data = (data "    <td>"$i"</td>\n");
+                    }
+                }
+            }
+        }
+        else if (flag == 2)
+        {
+            for (i = 0; i <= NF; i++)
+            {
+                if (i == 1)
+                {
+                    data = (data "    <td style=\"padding-left: 10px\">\\f$"$i"\\f$</td>\n");
+                    data = (data "    <td style=\"padding-left: 10px; padding-right: 10px;\">=</td>\n");
+                }
+                else if (i > 1)
+                {
+                    data = (data "    <td>"$i"</td>\n");
+                }
+            }
+        }
+        data = (data "</tr>\n");
+        firstRow = 0;
+    }
+    else
+    {
+        print $0
+    }
+}
+
+
diff --git a/bin/tools/doxyFilter.sed b/bin/tools/doxyFilter.sed
index 681929a904..b1bbfc20de 100644
--- a/bin/tools/doxyFilter.sed
+++ b/bin/tools/doxyFilter.sed
@@ -150,6 +150,10 @@ s? *\([a-zA-Z0-9]*\.[a-zA-Z]*\)?  <li><a href="%dirName%/\1">\1</a></li>?
 
 s/.*\*\//\*\//
 
+
+# convert /heading in source files to bold font and add some space
+s#/heading \(.*\)#<br><b>\1</b>#g
+
 }
 
 # -----------------------------------------------------------------------------