1 files changed, 19 insertions, 4 deletions
diff --git a/lib/options-reader.js b/lib/options-reader.js
index 3cac969..fa215f4 100644
--- a/lib/options-reader.js
+++ b/lib/options-reader.js
@@ -28,13 +28,28 @@ var standardOptions = exports._standardOptions = {
 
 function readOptions(options) {
     options = options || {};
-    if (options.styleMap && _.isString(options.styleMap)) {
-        options.styleMap = options.styleMap.split("\n").map(function(line) {
+    var fullOptions = extend(standardOptions, options);
+    
+    fullOptions.styleMap = readStyleMap(options).concat(standardOptions.styleMap);
+    
+    return fullOptions;
+}
+
+function readStyleMap(options) {
+    var customStyleMap = readCustomStyleMap(options.styleMap);
+    return customStyleMap;
+}
+
+function readCustomStyleMap(styleMap) {
+    if (!styleMap) {
+        return [];
+    } else if (_.isString(styleMap)) {
+        return styleMap.split("\n").map(function(line) {
             return style(line.trim());
         });
+    } else {
+        return styleMap;
     }
-    
-    return extend(standardOptions, options);
 }