diff --git a/src/diff-parser.js b/src/diff-parser.js
index 0439780..f8120d3 100644
--- a/src/diff-parser.js
+++ b/src/diff-parser.js
@@ -63,7 +63,7 @@
         }
 
         if (currentFile.newName) {
-          if (configuration.maxLinesShowing && currentFile.deletedLines + currentFile.addedLines > configuration.maxLinesShowing) {
+          if ((configuration || {}).maxLinesShowing && currentFile.deletedLines + currentFile.addedLines > configuration.maxLinesShowing) {
             currentFile.shouldCollapse = true;
           }
           files.push(currentFile);
diff --git a/test/diff2html-tests.js b/test/diff2html-tests.js
index 23e83da..5b2bedf 100644
--- a/test/diff2html-tests.js
+++ b/test/diff2html-tests.js
@@ -79,6 +79,8 @@ var htmlLineExample1 =
   '        <path d="M6 5H2v-1h4v1zM2 8h7v-1H2v1z m0 2h7v-1H2v1z m0 2h7v-1H2v1z m10-7.5v9.5c0 0.55-0.45 1-1 1H1c-0.55 0-1-0.45-1-1V2c0-0.55 0.45-1 1-1h7.5l3.5 3.5z m-1 0.5L8 2H1v12h10V5z"></path>\n' +
   '    </svg>    <span class="d2h-file-name">sample</span>\n' +
   '    <span class="d2h-tag d2h-changed d2h-changed-tag">CHANGED</span></span>\n' +
+  '    <a class="d2h-file-collapse-switch d2h-collapse">collapse</a>\n' +
+  '    <a class="d2h-file-collapse-switch d2h-expand">expand</a>\n' +
   '    </div>\n' +
   '    <div class="d2h-file-diff">\n' +
   '        <div class="d2h-code-wrapper">\n' +
@@ -130,6 +132,8 @@ var htmlSideExample1 =
   '        <path d="M6 5H2v-1h4v1zM2 8h7v-1H2v1z m0 2h7v-1H2v1z m0 2h7v-1H2v1z m10-7.5v9.5c0 0.55-0.45 1-1 1H1c-0.55 0-1-0.45-1-1V2c0-0.55 0.45-1 1-1h7.5l3.5 3.5z m-1 0.5L8 2H1v12h10V5z"></path>\n' +
   '    </svg>    <span class="d2h-file-name">sample</span>\n' +
   '    <span class="d2h-tag d2h-changed d2h-changed-tag">CHANGED</span></span>\n' +
+  '      <a class="d2h-file-collapse-switch d2h-collapse">collapse</a>\n' +
+  '      <a class="d2h-file-collapse-switch d2h-expand">expand</a>\n' +
   '    </div>\n' +
   '    <div class="d2h-files-diff">\n' +
   '        <div class="d2h-file-side-diff">\n' +
@@ -318,6 +322,8 @@ describe('Diff2Html', function() {
         '        <path d="M6 5H2v-1h4v1zM2 8h7v-1H2v1z m0 2h7v-1H2v1z m0 2h7v-1H2v1z m10-7.5v9.5c0 0.55-0.45 1-1 1H1c-0.55 0-1-0.45-1-1V2c0-0.55 0.45-1 1-1h7.5l3.5 3.5z m-1 0.5L8 2H1v12h10V5z"></path>\n' +
         '    </svg>    <span class="d2h-file-name">CHANGELOG.md</span>\n' +
         '    <span class="d2h-tag d2h-changed d2h-changed-tag">CHANGED</span></span>\n' +
+        '    <a class="d2h-file-collapse-switch d2h-collapse">collapse</a>\n' +
+        '    <a class="d2h-file-collapse-switch d2h-expand">expand</a>\n' +
         '    </div>\n' +
         '    <div class="d2h-file-diff">\n' +
         '        <div class="d2h-code-wrapper">\n' +
diff --git a/test/line-by-line-tests.js b/test/line-by-line-tests.js
index 767e959..5c53fac 100644
--- a/test/line-by-line-tests.js
+++ b/test/line-by-line-tests.js
@@ -156,6 +156,8 @@ describe('LineByLinePrinter', function() {
         '        <path d="M6 5H2v-1h4v1zM2 8h7v-1H2v1z m0 2h7v-1H2v1z m0 2h7v-1H2v1z m10-7.5v9.5c0 0.55-0.45 1-1 1H1c-0.55 0-1-0.45-1-1V2c0-0.55 0.45-1 1-1h7.5l3.5 3.5z m-1 0.5L8 2H1v12h10V5z"></path>\n' +
         '    </svg>    <span class="d2h-file-name">my/file/name.js</span>\n' +
         '    <span class="d2h-tag d2h-changed d2h-changed-tag">CHANGED</span></span>\n' +
+        '    <a class="d2h-file-collapse-switch d2h-collapse">collapse</a>\n' +
+        '    <a class="d2h-file-collapse-switch d2h-expand">expand</a>\n' +
         '    </div>\n' +
         '    <div class="d2h-file-diff">\n' +
         '        <div class="d2h-code-wrapper">\n' +
@@ -193,6 +195,8 @@ describe('LineByLinePrinter', function() {
         '        <path d="M6 5H2v-1h4v1zM2 8h7v-1H2v1z m0 2h7v-1H2v1z m0 2h7v-1H2v1z m10-7.5v9.5c0 0.55-0.45 1-1 1H1c-0.55 0-1-0.45-1-1V2c0-0.55 0.45-1 1-1h7.5l3.5 3.5z m-1 0.5L8 2H1v12h10V5z"></path>\n' +
         '    </svg>    <span class="d2h-file-name">my/file/name.js</span>\n' +
         '    <span class="d2h-tag d2h-added d2h-added-tag">ADDED</span></span>\n' +
+        '    <a class="d2h-file-collapse-switch d2h-collapse">collapse</a>\n' +
+        '    <a class="d2h-file-collapse-switch d2h-expand">expand</a>\n' +
         '    </div>\n' +
         '    <div class="d2h-file-diff">\n' +
         '        <div class="d2h-code-wrapper">\n' +
@@ -230,6 +234,8 @@ describe('LineByLinePrinter', function() {
         '        <path d="M6 5H2v-1h4v1zM2 8h7v-1H2v1z m0 2h7v-1H2v1z m0 2h7v-1H2v1z m10-7.5v9.5c0 0.55-0.45 1-1 1H1c-0.55 0-1-0.45-1-1V2c0-0.55 0.45-1 1-1h7.5l3.5 3.5z m-1 0.5L8 2H1v12h10V5z"></path>\n' +
         '    </svg>    <span class="d2h-file-name">my/file/name.js</span>\n' +
         '    <span class="d2h-tag d2h-deleted d2h-deleted-tag">DELETED</span></span>\n' +
+        '    <a class="d2h-file-collapse-switch d2h-collapse">collapse</a>\n' +
+        '    <a class="d2h-file-collapse-switch d2h-expand">expand</a>\n' +
         '    </div>\n' +
         '    <div class="d2h-file-diff">\n' +
         '        <div class="d2h-code-wrapper">\n' +
@@ -267,6 +273,8 @@ describe('LineByLinePrinter', function() {
         '        <path d="M6 5H2v-1h4v1zM2 8h7v-1H2v1z m0 2h7v-1H2v1z m0 2h7v-1H2v1z m10-7.5v9.5c0 0.55-0.45 1-1 1H1c-0.55 0-1-0.45-1-1V2c0-0.55 0.45-1 1-1h7.5l3.5 3.5z m-1 0.5L8 2H1v12h10V5z"></path>\n' +
         '    </svg>    <span class="d2h-file-name">my/file/{name1.js → name2.js}</span>\n' +
         '    <span class="d2h-tag d2h-moved d2h-moved-tag">RENAMED</span></span>\n' +
+        '    <a class="d2h-file-collapse-switch d2h-collapse">collapse</a>\n' +
+        '    <a class="d2h-file-collapse-switch d2h-expand">expand</a>\n' +
         '    </div>\n' +
         '    <div class="d2h-file-diff">\n' +
         '        <div class="d2h-code-wrapper">\n' +
@@ -345,6 +353,8 @@ describe('LineByLinePrinter', function() {
         '        <path d="M6 5H2v-1h4v1zM2 8h7v-1H2v1z m0 2h7v-1H2v1z m0 2h7v-1H2v1z m10-7.5v9.5c0 0.55-0.45 1-1 1H1c-0.55 0-1-0.45-1-1V2c0-0.55 0.45-1 1-1h7.5l3.5 3.5z m-1 0.5L8 2H1v12h10V5z"></path>\n' +
         '    </svg>    <span class="d2h-file-name">sample</span>\n' +
         '    <span class="d2h-tag d2h-changed d2h-changed-tag">CHANGED</span></span>\n' +
+        '    <a class="d2h-file-collapse-switch d2h-collapse">collapse</a>\n' +
+        '    <a class="d2h-file-collapse-switch d2h-expand">expand</a>\n' +
         '    </div>\n' +
         '    <div class="d2h-file-diff">\n' +
         '        <div class="d2h-code-wrapper">\n' +
@@ -410,6 +420,8 @@ describe('LineByLinePrinter', function() {
         '        <path d="M6 5H2v-1h4v1zM2 8h7v-1H2v1z m0 2h7v-1H2v1z m0 2h7v-1H2v1z m10-7.5v9.5c0 0.55-0.45 1-1 1H1c-0.55 0-1-0.45-1-1V2c0-0.55 0.45-1 1-1h7.5l3.5 3.5z m-1 0.5L8 2H1v12h10V5z"></path>\n' +
         '    </svg>    <span class="d2h-file-name">sample</span>\n' +
         '    <span class="d2h-tag d2h-changed d2h-changed-tag">CHANGED</span></span>\n' +
+        '    <a class="d2h-file-collapse-switch d2h-collapse">collapse</a>\n' +
+        '    <a class="d2h-file-collapse-switch d2h-expand">expand</a>\n' +
         '    </div>\n' +
         '    <div class="d2h-file-diff">\n' +
         '        <div class="d2h-code-wrapper">\n' +
diff --git a/test/side-by-side-printer-tests.js b/test/side-by-side-printer-tests.js
index eb2e4ef..3feaa54 100644
--- a/test/side-by-side-printer-tests.js
+++ b/test/side-by-side-printer-tests.js
@@ -241,6 +241,8 @@ describe('SideBySidePrinter', function() {
         '        <path d="M6 5H2v-1h4v1zM2 8h7v-1H2v1z m0 2h7v-1H2v1z m0 2h7v-1H2v1z m10-7.5v9.5c0 0.55-0.45 1-1 1H1c-0.55 0-1-0.45-1-1V2c0-0.55 0.45-1 1-1h7.5l3.5 3.5z m-1 0.5L8 2H1v12h10V5z"></path>\n' +
         '    </svg>    <span class="d2h-file-name">sample</span>\n' +
         '    <span class="d2h-tag d2h-changed d2h-changed-tag">CHANGED</span></span>\n' +
+        '      <a class="d2h-file-collapse-switch d2h-collapse">collapse</a>\n' +
+        '      <a class="d2h-file-collapse-switch d2h-expand">expand</a>\n' +
         '    </div>\n' +
         '    <div class="d2h-files-diff">\n' +
         '        <div class="d2h-file-side-diff">\n' +
@@ -317,6 +319,8 @@ describe('SideBySidePrinter', function() {
         '        <path d="M6 5H2v-1h4v1zM2 8h7v-1H2v1z m0 2h7v-1H2v1z m0 2h7v-1H2v1z m10-7.5v9.5c0 0.55-0.45 1-1 1H1c-0.55 0-1-0.45-1-1V2c0-0.55 0.45-1 1-1h7.5l3.5 3.5z m-1 0.5L8 2H1v12h10V5z"></path>\n' +
         '    </svg>    <span class="d2h-file-name">sample</span>\n' +
         '    <span class="d2h-tag d2h-changed d2h-changed-tag">CHANGED</span></span>\n' +
+        '      <a class="d2h-file-collapse-switch d2h-collapse">collapse</a>\n' +
+        '      <a class="d2h-file-collapse-switch d2h-expand">expand</a>\n' +
         '    </div>\n' +
         '    <div class="d2h-files-diff">\n' +
         '        <div class="d2h-file-side-diff">\n' +