diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenResponse.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenResponse.java
index ec0f7f11bb5..b2a734fc9b2 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenResponse.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenResponse.java
@@ -10,6 +10,7 @@ public class CodegenResponse {
     public boolean hasMore;
     public List<Map<String, Object>> examples;
     public String dataType, baseType, containerType;
+    public boolean hasHeaders;
     public boolean isString, isInteger, isLong, isFloat, isDouble, isByteArray, isBoolean, isDate, isDateTime;
     public boolean isDefault;
     public boolean simpleType;
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java
index d264523e08c..586a95fefb4 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java
@@ -2231,6 +2231,7 @@ public CodegenResponse fromResponse(String responseCode, Response response) {
         r.jsonSchema = Json.pretty(response);
         r.vendorExtensions = response.getVendorExtensions();
         addHeaders(response, r.headers);
+        r.hasHeaders = !r.headers.isEmpty();
 
         if (r.schema != null) {
             Property responseProperty = response.getSchema();
diff --git a/modules/swagger-codegen/src/main/resources/htmlDocs2/index.mustache b/modules/swagger-codegen/src/main/resources/htmlDocs2/index.mustache
index 01f9f2eb720..fc0f5f38204 100644
--- a/modules/swagger-codegen/src/main/resources/htmlDocs2/index.mustache
+++ b/modules/swagger-codegen/src/main/resources/htmlDocs2/index.mustache
@@ -336,24 +336,30 @@
                           {{#responses}}
                             <h3> Status: {{code}} - {{message}} </h3>
 
-                            {{#schema}}
-                              <ul class="nav nav-tabs nav-tabs-examples" >
+                            <ul class="nav nav-tabs nav-tabs-examples" >
+                              {{#schema}}
                                 <li class="active">
-                                  <a href="#examples-{{baseName}}-{{nickname}}-schema">Schema</a>
+                                  <a data-toggle="tab" href="#responses-{{nickname}}-{{code}}-schema">Schema</a>
                                 </li>
 
                                 {{#examples}}
                                   <li class="">
-                                    <a href="#examples-{{baseName}}-{{nickname}}-example">Response Example</a>
+                                    <a data-toggle="tab" href="#responses-{{nickname}}-{{code}}-example">Response Example</a>
                                   </li>
                                 {{/examples}}
-                              </ul>
-
-                              <div class="tab-content" style='margin-bottom: 10px;'>
-                                <div class="tab-pane active" id="examples-{{baseName}}-{{nickname}}-schema">
-                                  <div id='examples-{{baseName}}-{{nickname}}-schema-{{code}}' style="padding: 30px; border-left: 1px solid #eee; border-right: 1px solid #eee; border-bottom: 1px solid #eee;">
-
-                                    <script>
+                              {{/schema}}
+                              {{#hasHeaders}}
+                                <li class="">
+                                  <a data-toggle="tab" href="#responses-{{nickname}}-{{code}}-headers">Headers</a>
+                                </li>
+                              {{/hasHeaders}}
+                            </ul>
+
+                            <div class="tab-content" style='margin-bottom: 10px;'>
+                              {{#schema}}
+                                <div class="tab-pane active" id="responses-{{nickname}}-{{code}}-schema">
+                                  <div id='responses-{{nickname}}-{{code}}-schema-{{code}}' style="padding: 30px; border-left: 1px solid #eee; border-right: 1px solid #eee; border-bottom: 1px solid #eee;">
+                                                               <script>
                                       $(document).ready(function() {
                                         var schemaWrapper = {{{jsonSchema}}};
                                         var schema = schemaWrapper.schema;
@@ -366,23 +372,44 @@
                                         }, function(err, resolved, metadata) {
                                           //console.log(JSON.stringify(resolved));
                                           var view = new JSONSchemaView(resolved.schema, 3);
-                                          $('#examples-{{baseName}}-{{nickname}}-schema-data').val(JSON.stringify(resolved.schema));
-                                          var result = $('#examples-{{baseName}}-{{nickname}}-schema-{{code}}');
+                                          $('#responses-{{nickname}}-{{code}}-schema-data').val(JSON.stringify(resolved.schema));
+                                          var result = $('#responses-{{nickname}}-{{code}}-schema-{{code}}');
                                           result.empty();
                                           result.append(view.render());
                                         });
                                       });
                                     </script>
                                   </div>
-                                  <input id='examples-{{baseName}}-{{nickname}}-schema-data' type='hidden' value=''></input>
+                                  <input id='responses-{{nickname}}-{{code}}-schema-data' type='hidden' value=''></input>
                                 </div>
                                 {{#examples}}
-                                  <div class="tab-pane" id="examples-{{baseName}}-{{nickname}}-example">
-                                    <pre class="prettyprint"><code class="json">{{example}}</code></pre>
-                                  </div>
+                                  <div class="tab-pane" id="responses-{{nickname}}-{{code}}-example">
+                                      <pre class="prettyprint"><code class="json">{{example}}</code></pre>
+                                </div>
                                 {{/examples}}
-                              </div>
-                            {{/schema}}
+                              {{/schema}}
+                              {{#hasHeaders}}
+                                <div class="tab-pane" id="responses-{{nickname}}-{{code}}-headers">
+                                    <table>
+                                        <tr>
+                                            <th width="150px">Name</th>
+                                            <th width="100px">Type</th>
+                                            <th width="100px">Format</th>
+                                            <th>Description</th>
+                                        </tr>
+                                        {{#headers}}
+                                        <tr>
+                                            <td>{{#name}}{{name}}{{/name}}</td>
+                                            <td>{{#datatype}}{{datatype}}{{/datatype}}</td>
+                                            <td>{{#dataFormat}}{{dataFormat}}{{/dataFormat}}</td>
+                                            <td>{{#description}}{{description}}{{/description}}</td>
+                                        </tr>
+                                        {{/headers}}
+                                    </table>
+                                </div>
+                              {{/hasHeaders}}
+                            </div>
+
                           {{/responses}}
                         </article>
                       </div>
diff --git a/modules/swagger-codegen/src/test/resources/2_0/responseHeaderTest.yaml b/modules/swagger-codegen/src/test/resources/2_0/responseHeaderTest.yaml
new file mode 100644
index 00000000000..7c868bdabac
--- /dev/null
+++ b/modules/swagger-codegen/src/test/resources/2_0/responseHeaderTest.yaml
@@ -0,0 +1,41 @@
+swagger: '2.0'
+info:
+  description: 'Test for displaying response headers'
+  version: 1.0.0
+  title: Response header test
+  license:
+    name: Apache 2.0
+    url: 'http://www.apache.org/licenses/LICENSE-2.0.html'
+basePath: /
+schemes:
+  - http
+paths:
+  /test:
+    get:
+      summary: Test
+      description: Test
+      produces:
+        - application/json
+      responses:
+        '200':
+          description: successful operation
+          schema:
+            type: array
+            items:
+              type: string
+          headers:
+            X-STATUS:
+              type: "integer"
+              description: "Output status of the operation"
+        '500':
+          description: "Internal server error"
+          headers:
+            X-MSG-ID:
+              type: "string"
+              format: ".*"
+              description: "I am the error description"
+            X-ERROR-ID:
+              type: "integer"
+              description: "I am the error code"
+        '400':
+          description: Invalid ID supplied
\ No newline at end of file
diff --git a/samples/html2/index.html b/samples/html2/index.html
index bec62b55586..92fccb3f651 100644
--- a/samples/html2/index.html
+++ b/samples/html2/index.html
@@ -1266,6 +1266,12 @@ <h2>Parameters</h2>
                           <h2>Responses</h2>
                             <h3> Status: 405 - Invalid input </h3>
 
+                            <ul class="nav nav-tabs nav-tabs-examples" >
+                            </ul>
+
+                            <div class="tab-content" style='margin-bottom: 10px;'>
+                            </div>
+
                         </article>
                       </div>
                       <hr>
@@ -1555,7 +1561,7 @@ <h2>Parameters</h2>
                                 <th width="150px">Name</th>
                                 <th>Description</th>
                               </tr>
-                                  <tr><td style="width:150px;">apiKey</td>
+                                  <tr><td style="width:150px;">api_key</td>
 <td>
 
 
@@ -1595,6 +1601,12 @@ <h2>Parameters</h2>
                           <h2>Responses</h2>
                             <h3> Status: 400 - Invalid pet value </h3>
 
+                            <ul class="nav nav-tabs nav-tabs-examples" >
+                            </ul>
+
+                            <div class="tab-content" style='margin-bottom: 10px;'>
+                            </div>
+
                         </article>
                       </div>
                       <hr>
@@ -1858,8 +1870,8 @@ <h2>Parameters</h2>
   "type" : "array",
   "items" : {
     "type" : "string",
-    "enum" : [ "available", "pending", "sold" ],
-    "default" : "available"
+    "default" : "available",
+    "enum" : [ "available", "pending", "sold" ]
   },
   "collectionFormat" : "csv"
 };
@@ -1888,18 +1900,17 @@ <h2>Parameters</h2>
                           <h2>Responses</h2>
                             <h3> Status: 200 - successful operation </h3>
 
-                              <ul class="nav nav-tabs nav-tabs-examples" >
+                            <ul class="nav nav-tabs nav-tabs-examples" >
                                 <li class="active">
-                                  <a href="#examples-Pet-findPetsByStatus-schema">Schema</a>
+                                  <a data-toggle="tab" href="#responses-findPetsByStatus-200-schema">Schema</a>
                                 </li>
 
-                              </ul>
-
-                              <div class="tab-content" style='margin-bottom: 10px;'>
-                                <div class="tab-pane active" id="examples-Pet-findPetsByStatus-schema">
-                                  <div id='examples-Pet-findPetsByStatus-schema-200' style="padding: 30px; border-left: 1px solid #eee; border-right: 1px solid #eee; border-bottom: 1px solid #eee;">
+                            </ul>
 
-                                    <script>
+                            <div class="tab-content" style='margin-bottom: 10px;'>
+                                <div class="tab-pane active" id="responses-findPetsByStatus-200-schema">
+                                  <div id='responses-findPetsByStatus-200-schema-200' style="padding: 30px; border-left: 1px solid #eee; border-right: 1px solid #eee; border-bottom: 1px solid #eee;">
+                                                               <script>
                                       $(document).ready(function() {
                                         var schemaWrapper = {
   "description" : "successful operation",
@@ -1920,19 +1931,26 @@ <h3> Status: 200 - successful operation </h3>
                                         }, function(err, resolved, metadata) {
                                           //console.log(JSON.stringify(resolved));
                                           var view = new JSONSchemaView(resolved.schema, 3);
-                                          $('#examples-Pet-findPetsByStatus-schema-data').val(JSON.stringify(resolved.schema));
-                                          var result = $('#examples-Pet-findPetsByStatus-schema-200');
+                                          $('#responses-findPetsByStatus-200-schema-data').val(JSON.stringify(resolved.schema));
+                                          var result = $('#responses-findPetsByStatus-200-schema-200');
                                           result.empty();
                                           result.append(view.render());
                                         });
                                       });
                                     </script>
                                   </div>
-                                  <input id='examples-Pet-findPetsByStatus-schema-data' type='hidden' value=''></input>
+                                  <input id='responses-findPetsByStatus-200-schema-data' type='hidden' value=''></input>
                                 </div>
-                              </div>
+                            </div>
+
                             <h3> Status: 400 - Invalid status value </h3>
 
+                            <ul class="nav nav-tabs nav-tabs-examples" >
+                            </ul>
+
+                            <div class="tab-content" style='margin-bottom: 10px;'>
+                            </div>
+
                         </article>
                       </div>
                       <hr>
@@ -2224,18 +2242,17 @@ <h2>Parameters</h2>
                           <h2>Responses</h2>
                             <h3> Status: 200 - successful operation </h3>
 
-                              <ul class="nav nav-tabs nav-tabs-examples" >
+                            <ul class="nav nav-tabs nav-tabs-examples" >
                                 <li class="active">
-                                  <a href="#examples-Pet-findPetsByTags-schema">Schema</a>
+                                  <a data-toggle="tab" href="#responses-findPetsByTags-200-schema">Schema</a>
                                 </li>
 
-                              </ul>
-
-                              <div class="tab-content" style='margin-bottom: 10px;'>
-                                <div class="tab-pane active" id="examples-Pet-findPetsByTags-schema">
-                                  <div id='examples-Pet-findPetsByTags-schema-200' style="padding: 30px; border-left: 1px solid #eee; border-right: 1px solid #eee; border-bottom: 1px solid #eee;">
+                            </ul>
 
-                                    <script>
+                            <div class="tab-content" style='margin-bottom: 10px;'>
+                                <div class="tab-pane active" id="responses-findPetsByTags-200-schema">
+                                  <div id='responses-findPetsByTags-200-schema-200' style="padding: 30px; border-left: 1px solid #eee; border-right: 1px solid #eee; border-bottom: 1px solid #eee;">
+                                                               <script>
                                       $(document).ready(function() {
                                         var schemaWrapper = {
   "description" : "successful operation",
@@ -2256,19 +2273,26 @@ <h3> Status: 200 - successful operation </h3>
                                         }, function(err, resolved, metadata) {
                                           //console.log(JSON.stringify(resolved));
                                           var view = new JSONSchemaView(resolved.schema, 3);
-                                          $('#examples-Pet-findPetsByTags-schema-data').val(JSON.stringify(resolved.schema));
-                                          var result = $('#examples-Pet-findPetsByTags-schema-200');
+                                          $('#responses-findPetsByTags-200-schema-data').val(JSON.stringify(resolved.schema));
+                                          var result = $('#responses-findPetsByTags-200-schema-200');
                                           result.empty();
                                           result.append(view.render());
                                         });
                                       });
                                     </script>
                                   </div>
-                                  <input id='examples-Pet-findPetsByTags-schema-data' type='hidden' value=''></input>
+                                  <input id='responses-findPetsByTags-200-schema-data' type='hidden' value=''></input>
                                 </div>
-                              </div>
+                            </div>
+
                             <h3> Status: 400 - Invalid tag value </h3>
 
+                            <ul class="nav nav-tabs nav-tabs-examples" >
+                            </ul>
+
+                            <div class="tab-content" style='margin-bottom: 10px;'>
+                            </div>
+
                         </article>
                       </div>
                       <hr>
@@ -2571,18 +2595,17 @@ <h2>Parameters</h2>
                           <h2>Responses</h2>
                             <h3> Status: 200 - successful operation </h3>
 
-                              <ul class="nav nav-tabs nav-tabs-examples" >
+                            <ul class="nav nav-tabs nav-tabs-examples" >
                                 <li class="active">
-                                  <a href="#examples-Pet-getPetById-schema">Schema</a>
+                                  <a data-toggle="tab" href="#responses-getPetById-200-schema">Schema</a>
                                 </li>
 
-                              </ul>
+                            </ul>
 
-                              <div class="tab-content" style='margin-bottom: 10px;'>
-                                <div class="tab-pane active" id="examples-Pet-getPetById-schema">
-                                  <div id='examples-Pet-getPetById-schema-200' style="padding: 30px; border-left: 1px solid #eee; border-right: 1px solid #eee; border-bottom: 1px solid #eee;">
-
-                                    <script>
+                            <div class="tab-content" style='margin-bottom: 10px;'>
+                                <div class="tab-pane active" id="responses-getPetById-200-schema">
+                                  <div id='responses-getPetById-200-schema-200' style="padding: 30px; border-left: 1px solid #eee; border-right: 1px solid #eee; border-bottom: 1px solid #eee;">
+                                                               <script>
                                       $(document).ready(function() {
                                         var schemaWrapper = {
   "description" : "successful operation",
@@ -2600,21 +2623,34 @@ <h3> Status: 200 - successful operation </h3>
                                         }, function(err, resolved, metadata) {
                                           //console.log(JSON.stringify(resolved));
                                           var view = new JSONSchemaView(resolved.schema, 3);
-                                          $('#examples-Pet-getPetById-schema-data').val(JSON.stringify(resolved.schema));
-                                          var result = $('#examples-Pet-getPetById-schema-200');
+                                          $('#responses-getPetById-200-schema-data').val(JSON.stringify(resolved.schema));
+                                          var result = $('#responses-getPetById-200-schema-200');
                                           result.empty();
                                           result.append(view.render());
                                         });
                                       });
                                     </script>
                                   </div>
-                                  <input id='examples-Pet-getPetById-schema-data' type='hidden' value=''></input>
+                                  <input id='responses-getPetById-200-schema-data' type='hidden' value=''></input>
                                 </div>
-                              </div>
+                            </div>
+
                             <h3> Status: 400 - Invalid ID supplied </h3>
 
+                            <ul class="nav nav-tabs nav-tabs-examples" >
+                            </ul>
+
+                            <div class="tab-content" style='margin-bottom: 10px;'>
+                            </div>
+
                             <h3> Status: 404 - Pet not found </h3>
 
+                            <ul class="nav nav-tabs nav-tabs-examples" >
+                            </ul>
+
+                            <div class="tab-content" style='margin-bottom: 10px;'>
+                            </div>
+
                         </article>
                       </div>
                       <hr>
@@ -2904,10 +2940,28 @@ <h2>Parameters</h2>
                           <h2>Responses</h2>
                             <h3> Status: 400 - Invalid ID supplied </h3>
 
+                            <ul class="nav nav-tabs nav-tabs-examples" >
+                            </ul>
+
+                            <div class="tab-content" style='margin-bottom: 10px;'>
+                            </div>
+
                             <h3> Status: 404 - Pet not found </h3>
 
+                            <ul class="nav nav-tabs nav-tabs-examples" >
+                            </ul>
+
+                            <div class="tab-content" style='margin-bottom: 10px;'>
+                            </div>
+
                             <h3> Status: 405 - Validation exception </h3>
 
+                            <ul class="nav nav-tabs nav-tabs-examples" >
+                            </ul>
+
+                            <div class="tab-content" style='margin-bottom: 10px;'>
+                            </div>
+
                         </article>
                       </div>
                       <hr>
@@ -3280,6 +3334,12 @@ <h2>Parameters</h2>
                           <h2>Responses</h2>
                             <h3> Status: 405 - Invalid input </h3>
 
+                            <ul class="nav nav-tabs nav-tabs-examples" >
+                            </ul>
+
+                            <div class="tab-content" style='margin-bottom: 10px;'>
+                            </div>
+
                         </article>
                       </div>
                       <hr>
@@ -3661,18 +3721,17 @@ <h2>Parameters</h2>
                           <h2>Responses</h2>
                             <h3> Status: 200 - successful operation </h3>
 
-                              <ul class="nav nav-tabs nav-tabs-examples" >
+                            <ul class="nav nav-tabs nav-tabs-examples" >
                                 <li class="active">
-                                  <a href="#examples-Pet-uploadFile-schema">Schema</a>
+                                  <a data-toggle="tab" href="#responses-uploadFile-200-schema">Schema</a>
                                 </li>
 
-                              </ul>
-
-                              <div class="tab-content" style='margin-bottom: 10px;'>
-                                <div class="tab-pane active" id="examples-Pet-uploadFile-schema">
-                                  <div id='examples-Pet-uploadFile-schema-200' style="padding: 30px; border-left: 1px solid #eee; border-right: 1px solid #eee; border-bottom: 1px solid #eee;">
+                            </ul>
 
-                                    <script>
+                            <div class="tab-content" style='margin-bottom: 10px;'>
+                                <div class="tab-pane active" id="responses-uploadFile-200-schema">
+                                  <div id='responses-uploadFile-200-schema-200' style="padding: 30px; border-left: 1px solid #eee; border-right: 1px solid #eee; border-bottom: 1px solid #eee;">
+                                                               <script>
                                       $(document).ready(function() {
                                         var schemaWrapper = {
   "description" : "successful operation",
@@ -3690,17 +3749,18 @@ <h3> Status: 200 - successful operation </h3>
                                         }, function(err, resolved, metadata) {
                                           //console.log(JSON.stringify(resolved));
                                           var view = new JSONSchemaView(resolved.schema, 3);
-                                          $('#examples-Pet-uploadFile-schema-data').val(JSON.stringify(resolved.schema));
-                                          var result = $('#examples-Pet-uploadFile-schema-200');
+                                          $('#responses-uploadFile-200-schema-data').val(JSON.stringify(resolved.schema));
+                                          var result = $('#responses-uploadFile-200-schema-200');
                                           result.empty();
                                           result.append(view.render());
                                         });
                                       });
                                     </script>
                                   </div>
-                                  <input id='examples-Pet-uploadFile-schema-data' type='hidden' value=''></input>
+                                  <input id='responses-uploadFile-200-schema-data' type='hidden' value=''></input>
                                 </div>
-                              </div>
+                            </div>
+
                         </article>
                       </div>
                       <hr>
@@ -3955,8 +4015,20 @@ <h2>Parameters</h2>
                           <h2>Responses</h2>
                             <h3> Status: 400 - Invalid ID supplied </h3>
 
+                            <ul class="nav nav-tabs nav-tabs-examples" >
+                            </ul>
+
+                            <div class="tab-content" style='margin-bottom: 10px;'>
+                            </div>
+
                             <h3> Status: 404 - Order not found </h3>
 
+                            <ul class="nav nav-tabs nav-tabs-examples" >
+                            </ul>
+
+                            <div class="tab-content" style='margin-bottom: 10px;'>
+                            </div>
+
                         </article>
                       </div>
                       <hr>
@@ -4208,18 +4280,17 @@ <h2>Parameters</h2>
                           <h2>Responses</h2>
                             <h3> Status: 200 - successful operation </h3>
 
-                              <ul class="nav nav-tabs nav-tabs-examples" >
+                            <ul class="nav nav-tabs nav-tabs-examples" >
                                 <li class="active">
-                                  <a href="#examples-Store-getInventory-schema">Schema</a>
+                                  <a data-toggle="tab" href="#responses-getInventory-200-schema">Schema</a>
                                 </li>
 
-                              </ul>
+                            </ul>
 
-                              <div class="tab-content" style='margin-bottom: 10px;'>
-                                <div class="tab-pane active" id="examples-Store-getInventory-schema">
-                                  <div id='examples-Store-getInventory-schema-200' style="padding: 30px; border-left: 1px solid #eee; border-right: 1px solid #eee; border-bottom: 1px solid #eee;">
-
-                                    <script>
+                            <div class="tab-content" style='margin-bottom: 10px;'>
+                                <div class="tab-pane active" id="responses-getInventory-200-schema">
+                                  <div id='responses-getInventory-200-schema-200' style="padding: 30px; border-left: 1px solid #eee; border-right: 1px solid #eee; border-bottom: 1px solid #eee;">
+                                                               <script>
                                       $(document).ready(function() {
                                         var schemaWrapper = {
   "description" : "successful operation",
@@ -4241,17 +4312,18 @@ <h3> Status: 200 - successful operation </h3>
                                         }, function(err, resolved, metadata) {
                                           //console.log(JSON.stringify(resolved));
                                           var view = new JSONSchemaView(resolved.schema, 3);
-                                          $('#examples-Store-getInventory-schema-data').val(JSON.stringify(resolved.schema));
-                                          var result = $('#examples-Store-getInventory-schema-200');
+                                          $('#responses-getInventory-200-schema-data').val(JSON.stringify(resolved.schema));
+                                          var result = $('#responses-getInventory-200-schema-200');
                                           result.empty();
                                           result.append(view.render());
                                         });
                                       });
                                     </script>
                                   </div>
-                                  <input id='examples-Store-getInventory-schema-data' type='hidden' value=''></input>
+                                  <input id='responses-getInventory-200-schema-data' type='hidden' value=''></input>
                                 </div>
-                              </div>
+                            </div>
+
                         </article>
                       </div>
                       <hr>
@@ -4515,18 +4587,17 @@ <h2>Parameters</h2>
                           <h2>Responses</h2>
                             <h3> Status: 200 - successful operation </h3>
 
-                              <ul class="nav nav-tabs nav-tabs-examples" >
+                            <ul class="nav nav-tabs nav-tabs-examples" >
                                 <li class="active">
-                                  <a href="#examples-Store-getOrderById-schema">Schema</a>
+                                  <a data-toggle="tab" href="#responses-getOrderById-200-schema">Schema</a>
                                 </li>
 
-                              </ul>
+                            </ul>
 
-                              <div class="tab-content" style='margin-bottom: 10px;'>
-                                <div class="tab-pane active" id="examples-Store-getOrderById-schema">
-                                  <div id='examples-Store-getOrderById-schema-200' style="padding: 30px; border-left: 1px solid #eee; border-right: 1px solid #eee; border-bottom: 1px solid #eee;">
-
-                                    <script>
+                            <div class="tab-content" style='margin-bottom: 10px;'>
+                                <div class="tab-pane active" id="responses-getOrderById-200-schema">
+                                  <div id='responses-getOrderById-200-schema-200' style="padding: 30px; border-left: 1px solid #eee; border-right: 1px solid #eee; border-bottom: 1px solid #eee;">
+                                                               <script>
                                       $(document).ready(function() {
                                         var schemaWrapper = {
   "description" : "successful operation",
@@ -4544,21 +4615,34 @@ <h3> Status: 200 - successful operation </h3>
                                         }, function(err, resolved, metadata) {
                                           //console.log(JSON.stringify(resolved));
                                           var view = new JSONSchemaView(resolved.schema, 3);
-                                          $('#examples-Store-getOrderById-schema-data').val(JSON.stringify(resolved.schema));
-                                          var result = $('#examples-Store-getOrderById-schema-200');
+                                          $('#responses-getOrderById-200-schema-data').val(JSON.stringify(resolved.schema));
+                                          var result = $('#responses-getOrderById-200-schema-200');
                                           result.empty();
                                           result.append(view.render());
                                         });
                                       });
                                     </script>
                                   </div>
-                                  <input id='examples-Store-getOrderById-schema-data' type='hidden' value=''></input>
+                                  <input id='responses-getOrderById-200-schema-data' type='hidden' value=''></input>
                                 </div>
-                              </div>
+                            </div>
+
                             <h3> Status: 400 - Invalid ID supplied </h3>
 
+                            <ul class="nav nav-tabs nav-tabs-examples" >
+                            </ul>
+
+                            <div class="tab-content" style='margin-bottom: 10px;'>
+                            </div>
+
                             <h3> Status: 404 - Order not found </h3>
 
+                            <ul class="nav nav-tabs nav-tabs-examples" >
+                            </ul>
+
+                            <div class="tab-content" style='margin-bottom: 10px;'>
+                            </div>
+
                         </article>
                       </div>
                       <hr>
@@ -4830,18 +4914,17 @@ <h2>Parameters</h2>
                           <h2>Responses</h2>
                             <h3> Status: 200 - successful operation </h3>
 
-                              <ul class="nav nav-tabs nav-tabs-examples" >
+                            <ul class="nav nav-tabs nav-tabs-examples" >
                                 <li class="active">
-                                  <a href="#examples-Store-placeOrder-schema">Schema</a>
+                                  <a data-toggle="tab" href="#responses-placeOrder-200-schema">Schema</a>
                                 </li>
 
-                              </ul>
-
-                              <div class="tab-content" style='margin-bottom: 10px;'>
-                                <div class="tab-pane active" id="examples-Store-placeOrder-schema">
-                                  <div id='examples-Store-placeOrder-schema-200' style="padding: 30px; border-left: 1px solid #eee; border-right: 1px solid #eee; border-bottom: 1px solid #eee;">
+                            </ul>
 
-                                    <script>
+                            <div class="tab-content" style='margin-bottom: 10px;'>
+                                <div class="tab-pane active" id="responses-placeOrder-200-schema">
+                                  <div id='responses-placeOrder-200-schema-200' style="padding: 30px; border-left: 1px solid #eee; border-right: 1px solid #eee; border-bottom: 1px solid #eee;">
+                                                               <script>
                                       $(document).ready(function() {
                                         var schemaWrapper = {
   "description" : "successful operation",
@@ -4859,19 +4942,26 @@ <h3> Status: 200 - successful operation </h3>
                                         }, function(err, resolved, metadata) {
                                           //console.log(JSON.stringify(resolved));
                                           var view = new JSONSchemaView(resolved.schema, 3);
-                                          $('#examples-Store-placeOrder-schema-data').val(JSON.stringify(resolved.schema));
-                                          var result = $('#examples-Store-placeOrder-schema-200');
+                                          $('#responses-placeOrder-200-schema-data').val(JSON.stringify(resolved.schema));
+                                          var result = $('#responses-placeOrder-200-schema-200');
                                           result.empty();
                                           result.append(view.render());
                                         });
                                       });
                                     </script>
                                   </div>
-                                  <input id='examples-Store-placeOrder-schema-data' type='hidden' value=''></input>
+                                  <input id='responses-placeOrder-200-schema-data' type='hidden' value=''></input>
                                 </div>
-                              </div>
+                            </div>
+
                             <h3> Status: 400 - Invalid Order </h3>
 
+                            <ul class="nav nav-tabs nav-tabs-examples" >
+                            </ul>
+
+                            <div class="tab-content" style='margin-bottom: 10px;'>
+                            </div>
+
                         </article>
                       </div>
                       <hr>
@@ -5137,6 +5227,12 @@ <h2>Parameters</h2>
                           <h2>Responses</h2>
                             <h3> Status: 0 - successful operation </h3>
 
+                            <ul class="nav nav-tabs nav-tabs-examples" >
+                            </ul>
+
+                            <div class="tab-content" style='margin-bottom: 10px;'>
+                            </div>
+
                         </article>
                       </div>
                       <hr>
@@ -5402,6 +5498,12 @@ <h2>Parameters</h2>
                           <h2>Responses</h2>
                             <h3> Status: 0 - successful operation </h3>
 
+                            <ul class="nav nav-tabs nav-tabs-examples" >
+                            </ul>
+
+                            <div class="tab-content" style='margin-bottom: 10px;'>
+                            </div>
+
                         </article>
                       </div>
                       <hr>
@@ -5667,6 +5769,12 @@ <h2>Parameters</h2>
                           <h2>Responses</h2>
                             <h3> Status: 0 - successful operation </h3>
 
+                            <ul class="nav nav-tabs nav-tabs-examples" >
+                            </ul>
+
+                            <div class="tab-content" style='margin-bottom: 10px;'>
+                            </div>
+
                         </article>
                       </div>
                       <hr>
@@ -5918,8 +6026,20 @@ <h2>Parameters</h2>
                           <h2>Responses</h2>
                             <h3> Status: 400 - Invalid username supplied </h3>
 
+                            <ul class="nav nav-tabs nav-tabs-examples" >
+                            </ul>
+
+                            <div class="tab-content" style='margin-bottom: 10px;'>
+                            </div>
+
                             <h3> Status: 404 - User not found </h3>
 
+                            <ul class="nav nav-tabs nav-tabs-examples" >
+                            </ul>
+
+                            <div class="tab-content" style='margin-bottom: 10px;'>
+                            </div>
+
                         </article>
                       </div>
                       <hr>
@@ -6180,18 +6300,17 @@ <h2>Parameters</h2>
                           <h2>Responses</h2>
                             <h3> Status: 200 - successful operation </h3>
 
-                              <ul class="nav nav-tabs nav-tabs-examples" >
+                            <ul class="nav nav-tabs nav-tabs-examples" >
                                 <li class="active">
-                                  <a href="#examples-User-getUserByName-schema">Schema</a>
+                                  <a data-toggle="tab" href="#responses-getUserByName-200-schema">Schema</a>
                                 </li>
 
-                              </ul>
+                            </ul>
 
-                              <div class="tab-content" style='margin-bottom: 10px;'>
-                                <div class="tab-pane active" id="examples-User-getUserByName-schema">
-                                  <div id='examples-User-getUserByName-schema-200' style="padding: 30px; border-left: 1px solid #eee; border-right: 1px solid #eee; border-bottom: 1px solid #eee;">
-
-                                    <script>
+                            <div class="tab-content" style='margin-bottom: 10px;'>
+                                <div class="tab-pane active" id="responses-getUserByName-200-schema">
+                                  <div id='responses-getUserByName-200-schema-200' style="padding: 30px; border-left: 1px solid #eee; border-right: 1px solid #eee; border-bottom: 1px solid #eee;">
+                                                               <script>
                                       $(document).ready(function() {
                                         var schemaWrapper = {
   "description" : "successful operation",
@@ -6209,21 +6328,34 @@ <h3> Status: 200 - successful operation </h3>
                                         }, function(err, resolved, metadata) {
                                           //console.log(JSON.stringify(resolved));
                                           var view = new JSONSchemaView(resolved.schema, 3);
-                                          $('#examples-User-getUserByName-schema-data').val(JSON.stringify(resolved.schema));
-                                          var result = $('#examples-User-getUserByName-schema-200');
+                                          $('#responses-getUserByName-200-schema-data').val(JSON.stringify(resolved.schema));
+                                          var result = $('#responses-getUserByName-200-schema-200');
                                           result.empty();
                                           result.append(view.render());
                                         });
                                       });
                                     </script>
                                   </div>
-                                  <input id='examples-User-getUserByName-schema-data' type='hidden' value=''></input>
+                                  <input id='responses-getUserByName-200-schema-data' type='hidden' value=''></input>
                                 </div>
-                              </div>
+                            </div>
+
                             <h3> Status: 400 - Invalid username supplied </h3>
 
+                            <ul class="nav nav-tabs nav-tabs-examples" >
+                            </ul>
+
+                            <div class="tab-content" style='margin-bottom: 10px;'>
+                            </div>
+
                             <h3> Status: 404 - User not found </h3>
 
+                            <ul class="nav nav-tabs nav-tabs-examples" >
+                            </ul>
+
+                            <div class="tab-content" style='margin-bottom: 10px;'>
+                            </div>
+
                         </article>
                       </div>
                       <hr>
@@ -6527,18 +6659,20 @@ <h2>Parameters</h2>
                           <h2>Responses</h2>
                             <h3> Status: 200 - successful operation </h3>
 
-                              <ul class="nav nav-tabs nav-tabs-examples" >
+                            <ul class="nav nav-tabs nav-tabs-examples" >
                                 <li class="active">
-                                  <a href="#examples-User-loginUser-schema">Schema</a>
+                                  <a data-toggle="tab" href="#responses-loginUser-200-schema">Schema</a>
                                 </li>
 
-                              </ul>
-
-                              <div class="tab-content" style='margin-bottom: 10px;'>
-                                <div class="tab-pane active" id="examples-User-loginUser-schema">
-                                  <div id='examples-User-loginUser-schema-200' style="padding: 30px; border-left: 1px solid #eee; border-right: 1px solid #eee; border-bottom: 1px solid #eee;">
+                                <li class="">
+                                  <a data-toggle="tab" href="#responses-loginUser-200-headers">Headers</a>
+                                </li>
+                            </ul>
 
-                                    <script>
+                            <div class="tab-content" style='margin-bottom: 10px;'>
+                                <div class="tab-pane active" id="responses-loginUser-200-schema">
+                                  <div id='responses-loginUser-200-schema-200' style="padding: 30px; border-left: 1px solid #eee; border-right: 1px solid #eee; border-bottom: 1px solid #eee;">
+                                                               <script>
                                       $(document).ready(function() {
                                         var schemaWrapper = {
   "description" : "successful operation",
@@ -6568,19 +6702,48 @@ <h3> Status: 200 - successful operation </h3>
                                         }, function(err, resolved, metadata) {
                                           //console.log(JSON.stringify(resolved));
                                           var view = new JSONSchemaView(resolved.schema, 3);
-                                          $('#examples-User-loginUser-schema-data').val(JSON.stringify(resolved.schema));
-                                          var result = $('#examples-User-loginUser-schema-200');
+                                          $('#responses-loginUser-200-schema-data').val(JSON.stringify(resolved.schema));
+                                          var result = $('#responses-loginUser-200-schema-200');
                                           result.empty();
                                           result.append(view.render());
                                         });
                                       });
                                     </script>
                                   </div>
-                                  <input id='examples-User-loginUser-schema-data' type='hidden' value=''></input>
+                                  <input id='responses-loginUser-200-schema-data' type='hidden' value=''></input>
+                                </div>
+                                <div class="tab-pane" id="responses-loginUser-200-headers">
+                                    <table>
+                                        <tr>
+                                            <th width="150px">Name</th>
+                                            <th width="100px">Type</th>
+                                            <th width="100px">Format</th>
+                                            <th>Description</th>
+                                        </tr>
+                                        <tr>
+                                            <td>X-Rate-Limit</td>
+                                            <td>Integer</td>
+                                            <td>int32</td>
+                                            <td>calls per hour allowed by the user</td>
+                                        </tr>
+                                        <tr>
+                                            <td>X-Expires-After</td>
+                                            <td>Date</td>
+                                            <td>date-time</td>
+                                            <td>date in UTC when toekn expires</td>
+                                        </tr>
+                                    </table>
                                 </div>
-                              </div>
+                            </div>
+
                             <h3> Status: 400 - Invalid username/password supplied </h3>
 
+                            <ul class="nav nav-tabs nav-tabs-examples" >
+                            </ul>
+
+                            <div class="tab-content" style='margin-bottom: 10px;'>
+                            </div>
+
                         </article>
                       </div>
                       <hr>
@@ -6782,6 +6945,12 @@ <h2>Parameters</h2>
                           <h2>Responses</h2>
                             <h3> Status: 0 - successful operation </h3>
 
+                            <ul class="nav nav-tabs nav-tabs-examples" >
+                            </ul>
+
+                            <div class="tab-content" style='margin-bottom: 10px;'>
+                            </div>
+
                         </article>
                       </div>
                       <hr>
@@ -7094,8 +7263,20 @@ <h2>Parameters</h2>
                           <h2>Responses</h2>
                             <h3> Status: 400 - Invalid user supplied </h3>
 
+                            <ul class="nav nav-tabs nav-tabs-examples" >
+                            </ul>
+
+                            <div class="tab-content" style='margin-bottom: 10px;'>
+                            </div>
+
                             <h3> Status: 404 - User not found </h3>
 
+                            <ul class="nav nav-tabs nav-tabs-examples" >
+                            </ul>
+
+                            <div class="tab-content" style='margin-bottom: 10px;'>
+                            </div>
+
                         </article>
                       </div>
                       <hr>
@@ -7112,7 +7293,7 @@ <h3> Status: 404 - User not found </h3>
           </div>
           <div id="generator">
             <div class="content">
-              Generated 2017-01-24T11:58:21.560-05:00
+              Generated 2017-02-18T23:37:57.057+01:00
             </div>
           </div>
       </div>