diff --git a/docs/Camera.html b/docs/Camera.html
index e5c95a4..310074c 100644
--- a/docs/Camera.html
+++ b/docs/Camera.html
@@ -99,7 +99,7 @@
 <div class="method_description">Creates a clone of the object.</div>
 <div class="method_title">Returns</div>
 <div class="method_returns">
-<span class="type return_type"><a href="Camera.html" target="_self">Camera</a></span>
+<span class="type parameter_type"><a href="Camera.html" target="_self">Camera</a></span>
 </div>
 </div>
 
diff --git a/docs/EdgeSettings.html b/docs/EdgeSettings.html
index 9ac44cc..a73bdff 100644
--- a/docs/EdgeSettings.html
+++ b/docs/EdgeSettings.html
@@ -92,7 +92,7 @@
 <div class="method_description">Creates a clone of the object.</div>
 <div class="method_title">Returns</div>
 <div class="method_returns">
-<span class="type return_type"><a href="EdgeSettings.html" target="_self">EdgeSettings</a></span>
+<span class="type parameter_type"><a href="EdgeSettings.html" target="_self">EdgeSettings</a></span>
 </div>
 </div>
 
diff --git a/docs/EmbeddedViewer.html b/docs/EmbeddedViewer.html
index 684ad6d..ace647a 100644
--- a/docs/EmbeddedViewer.html
+++ b/docs/EmbeddedViewer.html
@@ -180,7 +180,7 @@
 <div class="method_description">Returns the underlying Viewer object.</div>
 <div class="method_title">Returns</div>
 <div class="method_returns">
-<span class="type return_type">Viewer</span>
+<span class="type parameter_type">Viewer</span>
 </div>
 </div>
 <div class="method_container">
@@ -189,7 +189,7 @@
 <div class="method_description">Returns the underlying Model object.</div>
 <div class="method_title">Returns</div>
 <div class="method_returns">
-<span class="type return_type">Model</span>
+<span class="type parameter_type">Model</span>
 </div>
 </div>
 <div class="method_container">
diff --git a/docs/EnvironmentSettings.html b/docs/EnvironmentSettings.html
index 3627be9..6b7ecf1 100644
--- a/docs/EnvironmentSettings.html
+++ b/docs/EnvironmentSettings.html
@@ -85,7 +85,7 @@
 <div class="method_description">Creates a clone of the object.</div>
 <div class="method_title">Returns</div>
 <div class="method_returns">
-<span class="type return_type"><a href="EnvironmentSettings.html" target="_self">EnvironmentSettings</a></span>
+<span class="type parameter_type"><a href="EnvironmentSettings.html" target="_self">EnvironmentSettings</a></span>
 </div>
 </div>
 
diff --git a/docs/Init3DViewerElement.html b/docs/Init3DViewerElement.html
index a45ea49..2574c14 100644
--- a/docs/Init3DViewerElement.html
+++ b/docs/Init3DViewerElement.html
@@ -86,7 +86,7 @@
 </div>
 <div class="method_title">Returns</div>
 <div class="method_returns">
-<span class="type return_type"><a href="EmbeddedViewer.html" target="_self">EmbeddedViewer</a></span>
+<span class="type parameter_type"><a href="EmbeddedViewer.html" target="_self">EmbeddedViewer</a></span>
 </div>
 </div>
 
diff --git a/docs/RGBAColor.html b/docs/RGBAColor.html
index 6168d8e..f172cf7 100644
--- a/docs/RGBAColor.html
+++ b/docs/RGBAColor.html
@@ -133,7 +133,7 @@
 <div class="method_description">Creates a clone of the object.</div>
 <div class="method_title">Returns</div>
 <div class="method_returns">
-<span class="type return_type"><a href="RGBAColor.html" target="_self">RGBAColor</a></span>
+<span class="type parameter_type"><a href="RGBAColor.html" target="_self">RGBAColor</a></span>
 </div>
 </div>
 
diff --git a/docs/RGBColor.html b/docs/RGBColor.html
index fe69061..1e3fbf8 100644
--- a/docs/RGBColor.html
+++ b/docs/RGBColor.html
@@ -119,7 +119,7 @@
 <div class="method_description">Creates a clone of the object.</div>
 <div class="method_title">Returns</div>
 <div class="method_returns">
-<span class="type return_type"><a href="RGBColor.html" target="_self">RGBColor</a></span>
+<span class="type parameter_type"><a href="RGBColor.html" target="_self">RGBColor</a></span>
 </div>
 </div>
 
diff --git a/docs/static/style.css b/docs/static/style.css
index 52e3b0e..cb140da 100644
--- a/docs/static/style.css
+++ b/docs/static/style.css
@@ -200,6 +200,7 @@ li
 .parameter_name
 {
 	font-family: monospace;
+	margin-right: 3px;
 }
 
 .type
@@ -210,20 +211,15 @@ li
 	border-radius: 3px;
 }
 
-.parameter_type
-{
-	margin-left: 3px;
-}
-
 .parameter_attributes
 {
 	color: #888888;
 	margin-left: 3px;
 }
 
-.return_type
+.return_description
 {
-	margin-right: 3px;
+	margin-left: 3px;
 }
 
 .parameter_description
diff --git a/tools/generate_docs.py b/tools/generate_docs.py
index f289ee1..ee530ad 100644
--- a/tools/generate_docs.py
+++ b/tools/generate_docs.py
@@ -210,12 +210,19 @@ class ClassDoc:
                GenerateMethodHtml (method, generator, navigation, False)
         return generator.GetHtml ()
 
+def GenerateParameterTypesHtml (paramTypes, generator, navigation):
+    for i in range (0, len (paramTypes)):
+        paramType = paramTypes[i]
+        paramTypeHtml = FinalizeType (paramType, navigation.entityLinks)
+        generator.AddTagWithClass ('span', 'type parameter_type', paramTypeHtml)
+        if (i < len (paramTypes) - 1):
+            generator.AddTagWithClass ('span', 'parameter_type_separator', '|')
+
 def GenerateParameterListHtml (parameters, generator, navigation):
     for param in parameters:
         generator.BeginTagWithClass ('div', 'parameter_header')
         generator.AddTagWithClass ('span', 'parameter_name', param.name)
-        typeNames = map (lambda x : FinalizeType (x, navigation.entityLinks), param.types)
-        generator.AddTagWithClass ('span', 'type parameter_type', ', '.join (typeNames))
+        GenerateParameterTypesHtml (param.types, generator, navigation)
         if param.isOptional:
             generator.AddTagWithClass ('span', 'parameter_attributes', '(optional)')
         generator.EndTag ('div')
@@ -242,8 +249,7 @@ def GenerateMethodHtml (method, generator, navigation, isConstructor):
         generator.AddTagWithClass ('div', 'method_title', 'Returns')
         generator.BeginTagWithClass ('div', 'method_returns')
         if method.returns.types != None:
-            typeNames = map (lambda x : FinalizeType (x, navigation.entityLinks), method.returns.types)
-            generator.AddTagWithClass ('span', 'type return_type', ', '.join (typeNames))
+            GenerateParameterTypesHtml (method.returns.types, generator, navigation)
         if method.returns.description != None:
             generator.AddTagWithClass ('span', 'return_description', FinalizeDescription (method.returns.description, navigation.entityLinks))
         generator.EndTag ('div')