1 files changed, 6 insertions, 2 deletions
diff --git a/lib/configuration.js b/lib/configuration.js
index 0b3073f..daf1b3c 100644
--- a/lib/configuration.js
+++ b/lib/configuration.js
@@ -6,7 +6,8 @@ var fs = require("./utils/fs");
 
 var Configuration = function(book, options) {
 	this.book = book;
-	this.options = _.extend({}, Configuration.DEFAULT, options || {});
+    this.options = _.cloneDeep(Configuration.DEFAULT);
+	this.options = _.merge(this.options, options || {});
 };
 
 // Read and parse the configuration
@@ -25,6 +26,9 @@ Configuration.prototype.load = function() {
         catch(err) {
             return Q();
         }
+    })
+    .then(function() {
+        that.options.output = that.options.output || path.join(that.book.root, "_book");
     });
 };
 
@@ -48,7 +52,7 @@ Configuration.DEFAULT = {
 
     // Structure
     "structure": {
-        "langs": "README.md",
+        "langs": "LANGS.md",
         "readme": "README.md",
         "glossary": "GLOSSARY.md",
         "summary": "SUMMARY.md"