less 3.0.0-pre.2 → 3.0.1

package/dist/less.js

@@ -1,8 +1,8 @@
 /*!
- * Less - Leaner CSS v3.0.0-pre.2
+ * Less - Leaner CSS v3.0.1
  * http://lesscss.org
  *
- * Copyright (c) 2009-2016, Alexis Sellier <self@cloudhead.net>
+ * Copyright (c) 2009-2018, Alexis Sellier <self@cloudhead.net>
  * Licensed under the Apache-2.0 License.
  *
  */
@@ -66,14 +66,30 @@ module.exports = function(window, options) {
  * used in the browser distributed version of less
  * to kick-start less using the browser api
  */
-/*global window, document */
+/* global window, document */
 
-// shim Promise if required
-require('promise/polyfill.js');
+// TODO - consider switching this out for a recommendation for this polyfill?
+// <script src="https://cdn.polyfill.io/v2/polyfill.min.js"></script>
+// Browsers have good Promise support
+require("promise/polyfill");
 
-var options = window.less || {};
+var options = require('../less/default-options')();
+
+if (window.less) {
+    for (key in window.less) {
+        if (window.less.hasOwnProperty(key)) {
+            options[key] = window.less[key];
+        }
+    }
+}
 require("./add-default-options")(window, options);
 
+options.plugins = options.plugins || [];
+
+if (window.LESS_PLUGINS) {
+    options.plugins = options.plugins.concat(window.LESS_PLUGINS);
+}
+
 var less = module.exports = require("./index")(window, options);
 
 window.less = less;
@@ -94,7 +110,7 @@ if (options.onReady) {
     if (/!watch/.test(window.location.hash)) {
         less.watch();
     }
-    // Simulate synchronous stylesheet loading by blocking page rendering
+    // Simulate synchronous stylesheet loading by hiding page rendering
     if (!options.async) {
         css = 'body { display: none !important }';
         head = document.head || document.getElementsByTagName('head')[0];
@@ -113,7 +129,7 @@ if (options.onReady) {
     less.pageLoadFinished = less.refresh(less.env === 'development').then(resolveOrReject, resolveOrReject);
 }
 
-},{"./add-default-options":1,"./index":8,"promise/polyfill.js":102}],3:[function(require,module,exports){
+},{"../less/default-options":16,"./add-default-options":1,"./index":8,"promise/polyfill":100}],3:[function(require,module,exports){
 var utils = require("./utils");
 module.exports = {
     createCSS: function (document, styles, sheet) {
@@ -199,8 +215,8 @@ module.exports = function(window, options, logger) {
                     if (modifyVars) {
                         cache.setItem(path + ':vars', JSON.stringify(modifyVars));
                     }
-                } catch(e) {
-                    //TODO - could do with adding more robust error handling
+                } catch (e) {
+                    // TODO - could do with adding more robust error handling
                     logger.error('failed to save "' + path + '" to local storage for caching.');
                 }
             }
@@ -250,7 +266,7 @@ module.exports = function(window, less, options) {
             }
         };
 
-        if (e.extract) {
+        if (e.line) {
             errorline(e, 0, '');
             errorline(e, 1, 'line');
             errorline(e, 2, '');
@@ -338,7 +354,7 @@ module.exports = function(window, less, options) {
     }
 
     function removeErrorConsole(path) {
-        //no action
+        // no action
     }
 
     function removeError(path) {
@@ -356,7 +372,7 @@ module.exports = function(window, less, options) {
         var filename = e.filename || rootHref;
         var errors = [];
         var content = (e.type || "Syntax") + "Error: " + (e.message || 'There is an error in your .less file') +
-            " in " + filename + " ";
+            " in " + filename;
 
         var errorline = function (e, i, classname) {
             if (e.extract[i] !== undefined) {
@@ -366,11 +382,11 @@ module.exports = function(window, less, options) {
             }
         };
 
-        if (e.extract) {
+        if (e.line) {
             errorline(e, 0, '');
             errorline(e, 1, 'line');
             errorline(e, 2, '');
-            content += 'on line ' + e.line + ', column ' + (e.column + 1) + ':\n' +
+            content += ' on line ' + e.line + ', column ' + (e.column + 1) + ':\n' +
                 errors.join('\n');
         }
         if (e.stack && (e.extract || options.logLevel >= 4)) {
@@ -396,7 +412,7 @@ module.exports = function(window, less, options) {
 };
 
 },{"./browser":3,"./utils":11}],6:[function(require,module,exports){
-/*global window, XMLHttpRequest */
+/* global window, XMLHttpRequest */
 
 module.exports = function(options, logger) {
 
@@ -404,22 +420,7 @@ module.exports = function(options, logger) {
 
     var fileCache = {};
 
-    //TODOS - move log somewhere. pathDiff and doing something similar in node. use pathDiff in the other browser file for the initial load
-
-    function getXMLHttpRequest() {
-        if (window.XMLHttpRequest && (window.location.protocol !== "file:" || !("ActiveXObject" in window))) {
-            return new XMLHttpRequest();
-        } else {
-            try {
-                /*global ActiveXObject */
-                return new ActiveXObject("Microsoft.XMLHTTP");
-            } catch (e) {
-                logger.error("browser doesn't support AJAX.");
-                return null;
-            }
-        }
-    }
-
+    // TODOS - move log somewhere. pathDiff and doing something similar in node. use pathDiff in the other browser file for the initial load
     var FileManager = function() {
     };
 
@@ -436,7 +437,7 @@ module.exports = function(options, logger) {
     };
     FileManager.prototype.doXHR = function doXHR(url, type, callback, errback) {
 
-        var xhr = getXMLHttpRequest();
+        var xhr = new XMLHttpRequest();
         var async = options.isFileProtocol ? options.fileAsync : true;
 
         if (typeof xhr.overrideMimeType === 'function') {
@@ -480,43 +481,50 @@ module.exports = function(options, logger) {
         fileCache = {};
     };
 
-    FileManager.prototype.loadFile = function loadFile(filename, currentDirectory, options, environment, callback) {
+    FileManager.prototype.loadFile = function loadFile(filename, currentDirectory, options, environment) {
+        // TODO: Add prefix support like less-node?
+        // What about multiple paths?
+
         if (currentDirectory && !this.isPathAbsolute(filename)) {
             filename = currentDirectory + filename;
         }
 
+        filename = options.ext ? this.tryAppendExtension(filename, options.ext) : filename;
+
         options = options || {};
 
         // sheet may be set to the stylesheet for the initial load or a collection of properties including
         // some context variables for imports
         var hrefParts = this.extractUrlParts(filename, window.location.href);
         var href      = hrefParts.url;
-
-        if (options.useFileCache && fileCache[href]) {
-            try {
-                var lessText = fileCache[href];
-                callback(null, { contents: lessText, filename: href, webInfo: { lastModified: new Date() }});
-            } catch (e) {
-                callback({filename: href, message: "Error loading file " + href + " error was " + e.message});
+        var self      = this;
+        
+        return new Promise(function(resolve, reject) {
+            if (options.useFileCache && fileCache[href]) {
+                try {
+                    var lessText = fileCache[href];
+                    return resolve({ contents: lessText, filename: href, webInfo: { lastModified: new Date() }});
+                } catch (e) {
+                    return reject({ filename: href, message: "Error loading file " + href + " error was " + e.message });
+                }
             }
-            return;
-        }
 
-        this.doXHR(href, options.mime, function doXHRCallback(data, lastModified) {
-            // per file cache
-            fileCache[href] = data;
+            self.doXHR(href, options.mime, function doXHRCallback(data, lastModified) {
+                // per file cache
+                fileCache[href] = data;
 
-            // Use remote copy (re-parse)
-            callback(null, { contents: data, filename: href, webInfo: { lastModified: lastModified }});
-        }, function doXHRError(status, url) {
-            callback({ type: 'File', message: "'" + url + "' wasn't found (" + status + ")", href: href });
+                // Use remote copy (re-parse)
+                resolve({ contents: data, filename: href, webInfo: { lastModified: lastModified }});
+            }, function doXHRError(status, url) {
+                reject({ type: 'File', message: "'" + url + "' wasn't found (" + status + ")", href: href });
+            });
         });
     };
 
     return FileManager;
 };
 
-},{"../less/environment/abstract-file-manager.js":16}],7:[function(require,module,exports){
+},{"../less/environment/abstract-file-manager.js":17}],7:[function(require,module,exports){
 module.exports = function() {
 
     var functionRegistry = require("./../less/functions/function-registry");
@@ -546,7 +554,7 @@ module.exports = function() {
     functionRegistry.addMultiple(imageFunctions);
 };
 
-},{"./../less/functions/function-registry":24}],8:[function(require,module,exports){
+},{"./../less/functions/function-registry":26}],8:[function(require,module,exports){
 //
 // index.js
 // Should expose the additional browser functions on to the less object
@@ -571,7 +579,7 @@ module.exports = function(window, options) {
     var cache = less.cache = options.cache || require("./cache")(window, options, less.logger);
     require('./image-size')(less.environment);
 
-    //Setup user functions - Deprecate?
+    // Setup user functions - Deprecate?
     if (options.functions) {
         less.functions.functionRegistry.addMultiple(options.functions);
     }
@@ -579,13 +587,7 @@ module.exports = function(window, options) {
     var typePattern = /^text\/(x-)?less$/;
 
     function clone(obj) {
-        var cloned = {};
-        for (var prop in obj) {
-            if (obj.hasOwnProperty(prop)) {
-                cloned[prop] = obj[prop];
-            }
-        }
-        return cloned;
+        return JSON.parse(JSON.stringify(obj || {}));
     }
 
     // only really needed for phantom
@@ -609,7 +611,7 @@ module.exports = function(window, options) {
                 var lessText = style.innerHTML || '';
                 instanceOptions.filename = document.location.href.replace(/#.*$/, '');
 
-                /*jshint loopfunc:true */
+                /* jshint loopfunc:true */
                 // use closure to store current style
                 less.render(lessText, instanceOptions,
                         bind(function(style, e, result) {
@@ -665,7 +667,7 @@ module.exports = function(window, options) {
 
             }
 
-            //TODO add tests around how this behaves when reloading
+            // TODO add tests around how this behaves when reloading
             errors.remove(path);
 
             instanceOptions.rootFileInfo = newFileInfo;
@@ -680,13 +682,14 @@ module.exports = function(window, options) {
             });
         }
 
-        fileManager.loadFile(sheet.href, null, instanceOptions, environment, function(e, loadedFile) {
-            if (e) {
-                callback(e);
-                return;
-            }
-            loadInitialFileCallback(loadedFile);
-        });
+        fileManager.loadFile(sheet.href, null, instanceOptions, environment)
+            .then(function(loadedFile) {
+                loadInitialFileCallback(loadedFile);
+            }).catch(function(err) {
+                console.log(err);
+                callback(err);
+            });
+
     }
 
     function loadStyleSheets(callback, reload, modifyVars) {
@@ -826,7 +829,7 @@ module.exports = function(window, options) {
     return less;
 };
 
-},{"../less":33,"./browser":3,"./cache":4,"./error-reporting":5,"./file-manager":6,"./image-size":7,"./log-listener":9,"./plugin-loader":10,"./utils":11}],9:[function(require,module,exports){
+},{"../less":35,"./browser":3,"./cache":4,"./error-reporting":5,"./file-manager":6,"./image-size":7,"./log-listener":9,"./plugin-loader":10,"./utils":11}],9:[function(require,module,exports){
 module.exports = function(less, options) {
 
     var logLevel_debug = 4,
@@ -872,6 +875,9 @@ module.exports = function(less, options) {
 };
 
 },{}],10:[function(require,module,exports){
+// TODO: Add tests for browser @plugin
+/*global window */
+
 var AbstractPluginLoader = require("../less/environment/abstract-plugin-loader.js");
 
 /**
@@ -879,63 +885,23 @@ var AbstractPluginLoader = require("../less/environment/abstract-plugin-loader.j
  */
 var PluginLoader = function(less) {
     this.less = less;
+    // shim for browser require?
     this.require = require;
 };
 
 PluginLoader.prototype = new AbstractPluginLoader();
 
-PluginLoader.prototype.tryLoadPlugin = function(name, basePath, callback) {
-    var self = this;
-    var prefix = name.slice(0, 1);
-    var explicit = prefix === "." || prefix === "/" || name.slice(-3).toLowerCase() === ".js";
-    this.tryLoadFromEnvironment(name, basePath, explicit, function(err, data) {
-        if (explicit) {
-            callback(err, data);
-        }
-        else {
-            if (!err) {
-                callback(null, data);
-            }
-            else {
-                self.tryLoadFromEnvironment('less-plugin-' + name, basePath, explicit, function(err2, data) {
-                    callback(err, data);
-                });
-            }
-        }
+PluginLoader.prototype.loadPlugin = function(filename, basePath, context, environment, fileManager) {
+    return new Promise(function(fulfill, reject) {
+        fileManager.loadFile(filename, basePath, context, environment)
+            .then(fulfill).catch(reject);
     });
-
-};
-
-PluginLoader.prototype.tryLoadFromEnvironment = function(filename, basePath, explicit, callback) {
-    var fileManager = new this.less.FileManager();
-
-    if (basePath) {
-        filename = (fileManager.extractUrlParts(filename, basePath)).url;
-    }
-
-    if (filename) {
-
-        filename = fileManager.tryAppendExtension(filename, '.js');
-        
-        var done = function(err, data) {
-            if (err) {
-                callback(err);
-            } else {
-                callback(null, data);
-            }
-        };
-        fileManager.loadFile(filename, null, null, null, done);
-
-    }
-    else {
-        callback({ message: 'Plugin could not be found.'});
-    }
 };
 
 module.exports = PluginLoader;
 
 
-},{"../less/environment/abstract-plugin-loader.js":17}],11:[function(require,module,exports){
+},{"../less/environment/abstract-plugin-loader.js":18}],11:[function(require,module,exports){
 module.exports = {
     extractId: function(href) {
         return href.replace(/^[a-z-]+:\/+?[^\/]+/, '')  // Remove protocol & domain
@@ -954,7 +920,7 @@ module.exports = {
                     try {
                         options[opt] = JSON.parse(tag.dataset[opt]);
                     }
-                    catch(_) {}
+                    catch (_) {}
                 }
             }
         }
@@ -1004,18 +970,18 @@ contexts.Parse = function(options) {
 };
 
 var evalCopyProperties = [
-    'paths',          // additional include paths
-    'compress',       // whether to compress
-    'ieCompat',       // whether to enforce IE compatibility (IE8 data-uri)
-    'strictMath',     // whether math has to be within parenthesis
-    'strictUnits',    // whether units need to evaluate correctly
-    'sourceMap',      // whether to output a source map
-    'importMultiple', // whether we are currently importing multiple copies
-    'urlArgs',        // whether to add args into url tokens
-    'javascriptEnabled',// option - whether Inline JavaScript is enabled. if undefined, defaults to false
-    'pluginManager',  // Used as the plugin manager for the session
-    'importantScope'  // used to bubble up !important statements
-    ];
+    'paths',             // additional include paths
+    'compress',          // whether to compress
+    'ieCompat',          // whether to enforce IE compatibility (IE8 data-uri)
+    'strictMath',        // whether math has to be within parenthesis
+    'strictUnits',       // whether units need to evaluate correctly
+    'sourceMap',         // whether to output a source map
+    'importMultiple',    // whether we are currently importing multiple copies
+    'urlArgs',           // whether to add args into url tokens
+    'javascriptEnabled', // option - whether Inline JavaScript is enabled. if undefined, defaults to false
+    'pluginManager',     // Used as the plugin manager for the session
+    'importantScope'     // used to bubble up !important statements
+];
 
 contexts.Eval = function(options, frames) {
     copyFromOriginal(options, this, evalCopyProperties);
@@ -1037,7 +1003,11 @@ contexts.Eval.prototype.outOfParenthesis = function () {
     this.parensStack.pop();
 };
 
+contexts.Eval.prototype.mathOn = true;
 contexts.Eval.prototype.isMathOn = function () {
+    if (!this.mathOn) {
+        return false;
+    }
     return this.strictMath ? (this.parensStack && this.parensStack.length) : true;
 };
 
@@ -1047,13 +1017,13 @@ contexts.Eval.prototype.isPathRelative = function (path) {
 
 contexts.Eval.prototype.normalizePath = function( path ) {
     var
-      segments = path.split("/").reverse(),
-      segment;
+        segments = path.split("/").reverse(),
+        segment;
 
     path = [];
     while (segments.length !== 0 ) {
         segment = segments.pop();
-        switch( segment ) {
+        switch ( segment ) {
             case ".":
                 break;
             case "..":
@@ -1072,7 +1042,7 @@ contexts.Eval.prototype.normalizePath = function( path ) {
     return path.join("/");
 };
 
-//todo - do the same for the toCSS ?
+// todo - do the same for the toCSS ?
 
 },{}],13:[function(require,module,exports){
 module.exports = {
@@ -1254,6 +1224,72 @@ module.exports = {
     }
 };
 },{}],16:[function(require,module,exports){
+// Export a new default each time
+module.exports = function() {
+    return {
+        /* Outputs a makefile import dependency list to stdout. */
+        depends: false,
+
+        /* Compress using less built-in compression. 
+         * This does an okay job but does not utilise all the tricks of 
+         * dedicated css compression. */
+        compress: false,
+
+        /* Runs the less parser and just reports errors without any output. */
+        lint: false,
+
+        /* Sets available include paths.
+         * If the file in an @import rule does not exist at that exact location, 
+         * less will look for it at the location(s) passed to this option. 
+         * You might use this for instance to specify a path to a library which 
+         * you want to be referenced simply and relatively in the less files. */
+        paths: [],
+
+        /* color output in the terminal */
+        color: true,
+
+        /* The strictImports controls whether the compiler will allow an @import inside of either 
+         * @media blocks or (a later addition) other selector blocks.
+         * See: https://github.com/less/less.js/issues/656 */
+        strictImports: false,
+
+        /* Allow Imports from Insecure HTTPS Hosts */
+        insecure: false,
+
+        /* Allows you to add a path to every generated import and url in your css. 
+         * This does not affect less import statements that are processed, just ones 
+         * that are left in the output css. */
+        rootpath: '',
+
+        /* By default URLs are kept as-is, so if you import a file in a sub-directory 
+         * that references an image, exactly the same URL will be output in the css. 
+         * This option allows you to re-write URL's in imported files so that the 
+         * URL is always relative to the base imported file */
+        relativeUrls: false,
+
+        /* Compatibility with IE8. Used for limiting data-uri length */
+        ieCompat: false,  // true until 3.0
+
+        /* Without this option on, Less will try and process all math in your css */
+        strictMath: false,
+
+        /* Without this option, less attempts to guess at the output unit when it does maths. */
+        strictUnits: false,
+
+        /* Effectively the declaration is put at the top of your base Less file, 
+         * meaning it can be used but it also can be overridden if this variable 
+         * is defined in the file. */
+        globalVars: null,
+
+        /* As opposed to the global variable option, this puts the declaration at the
+         * end of your base file, meaning it will override anything defined in your Less file. */
+        modifyVars: null,
+
+        /* This option allows you to specify a argument to go on to every URL.  */
+        urlArgs: ''
+    }
+}
+},{}],17:[function(require,module,exports){
 var abstractFileManager = function() {
 };
 
@@ -1291,7 +1327,7 @@ abstractFileManager.prototype.alwaysMakePathsAbsolute = function() {
 abstractFileManager.prototype.isPathAbsolute = function(filename) {
     return (/^(?:[a-z-]+:|\/|\\|#)/i).test(filename);
 };
-// TODO: pull out - this is part of Node & Browserify
+// TODO: pull out / replace?
 abstractFileManager.prototype.join = function(basePath, laterPath) {
     if (!basePath) {
         return laterPath;
@@ -1332,7 +1368,7 @@ abstractFileManager.prototype.extractUrlParts = function extractUrlParts(url, ba
 
     var urlPartsRegex = /^((?:[a-z-]+:)?\/{2}(?:[^\/\?#]*\/)|([\/\\]))?((?:[^\/\\\?#]*[\/\\])*)([^\/\\\?#]*)([#\?].*)?$/i,
         urlParts = url.match(urlPartsRegex),
-        returner = {}, directories = [], i, baseUrlParts;
+        returner = {}, rawDirectories = [], directories = [], i, baseUrlParts;
 
     if (!urlParts) {
         throw new Error("Could not parse sheet href - '" + url + "'");
@@ -1351,27 +1387,26 @@ abstractFileManager.prototype.extractUrlParts = function extractUrlParts(url, ba
     }
 
     if (urlParts[3]) {
-        directories = urlParts[3].replace(/\\/g, "/").split("/");
+        rawDirectories = urlParts[3].replace(/\\/g, "/").split("/");
 
-        // extract out . before .. so .. doesn't absorb a non-directory
-        for (i = 0; i < directories.length; i++) {
-            if (directories[i] === ".") {
-                directories.splice(i, 1);
-                i -= 1;
-            }
-        }
+        // collapse '..' and skip '.'
+        for (i = 0; i < rawDirectories.length; i++) {
 
-        for (i = 0; i < directories.length; i++) {
-            if (directories[i] === ".." && i > 0) {
-                directories.splice(i - 1, 2);
-                i -= 2;
+            if (rawDirectories[i] === "..") {
+                directories.pop();
+            }
+            else if (rawDirectories[i] !== ".") {
+                directories.push(rawDirectories[i]);
             }
+        
         }
     }
 
     returner.hostPart = urlParts[1];
     returner.directories = directories;
+    returner.rawPath = (urlParts[1] || "") + rawDirectories.join("/");
     returner.path = (urlParts[1] || "") + directories.join("/");
+    returner.filename = urlParts[4];
     returner.fileUrl = returner.path + (urlParts[4] || "");
     returner.url = returner.fileUrl + (urlParts[5] || "");
     return returner;
@@ -1379,7 +1414,7 @@ abstractFileManager.prototype.extractUrlParts = function extractUrlParts(url, ba
 
 module.exports = abstractFileManager;
 
-},{}],17:[function(require,module,exports){
+},{}],18:[function(require,module,exports){
 var functionRegistry = require("../functions/function-registry"),
     LessError = require('../less-error');
 
@@ -1394,13 +1429,12 @@ function error(msg, type) {
         }
     );
 }
-AbstractPluginLoader.prototype.evalPlugin = function(contents, context, pluginOptions, fileInfo) {
+AbstractPluginLoader.prototype.evalPlugin = function(contents, context, imports, pluginOptions, fileInfo) {
 
     var loader,
         registry,
         pluginObj,
         localModule,
-        localExports,
         pluginManager,
         filename;
 
@@ -1414,13 +1448,21 @@ AbstractPluginLoader.prototype.evalPlugin = function(contents, context, pluginOp
             filename = fileInfo.filename;
         }
     }
+    var shortname = (new this.less.FileManager()).extractUrlParts(filename).filename;
+
     if (filename) {
         pluginObj = pluginManager.get(filename);
 
         if (pluginObj) {
-            this.trySetOptions(pluginObj, filename, pluginOptions);
-            if (pluginObj.use) {
-                pluginObj.use(this.less);
+            this.trySetOptions(pluginObj, filename, shortname, pluginOptions);
+            try {
+                if (pluginObj.use) {
+                    pluginObj.use.call(this.context, pluginObj);
+                }
+            }
+            catch (e) {
+                e.message = 'Error during @plugin call';
+                return new this.less.LessError(e, imports, filename);
             }
             return pluginObj;
         }
@@ -1430,52 +1472,54 @@ AbstractPluginLoader.prototype.evalPlugin = function(contents, context, pluginOp
         pluginManager: pluginManager,
         fileInfo: fileInfo
     };
-    localExports = localModule.exports;
     registry = functionRegistry.create();
 
-    try {
-        loader = new Function("module", "require", "functions", "tree", "fileInfo", contents);
-        pluginObj = loader(localModule, this.require, registry, this.less.tree, fileInfo);
+    var registerPlugin = function(obj) {
+        pluginObj = obj;
+    };
 
-        if (!pluginObj) {
-            pluginObj = localModule.exports;
-        }
+    try {
+        loader = new Function("module", "require", "registerPlugin", "functions", "tree", "less", "fileInfo", contents);
+        loader(localModule, this.require, registerPlugin, registry, this.less.tree, this.less, fileInfo);
+    } catch (e) {
+        return new this.less.LessError(e, imports, filename);
+    }
 
-        pluginObj = this.validatePlugin(pluginObj, filename);
+    if (!pluginObj) {
+        pluginObj = localModule.exports;
+    }
+    pluginObj = this.validatePlugin(pluginObj, filename, shortname);
 
-        if (pluginObj) {
-            // Run on first load
-            pluginManager.addPlugin(pluginObj, fileInfo.filename);
-            pluginObj.functions = registry.getLocalFunctions();
+    if (pluginObj) {
+        // Run on first load
+        pluginManager.addPlugin(pluginObj, fileInfo.filename, registry);
+        pluginObj.functions = registry.getLocalFunctions();
+        pluginObj.imports = imports;
+        pluginObj.filename = filename;
 
-            this.trySetOptions(pluginObj, filename, pluginOptions);
+        this.trySetOptions(pluginObj, filename, shortname, pluginOptions);
 
-            // Run every @plugin call
+        // Run every @plugin call
+        try {
             if (pluginObj.use) {
-                pluginObj.use(this.less);
+                pluginObj.use.call(this.context, pluginObj);
             }
         }
-        else {
-            throw new SyntaxError("Not a valid plugin");
+        catch (e) {
+            e.message = 'Error during @plugin call';
+            return new this.less.LessError(e, imports, filename);
         }
 
-    } catch(e) {
-        // TODO pass the error
-        console.log(e);
-        return new this.less.LessError({
-            message: "Plugin evaluation error: '" + e.name + ': ' + e.message.replace(/["]/g, "'") + "'" ,
-            filename: filename,
-            line: this.line,
-            col: this.column
-        });
+    }
+    else {
+        return new this.less.LessError({ message: "Not a valid plugin" });
     }
 
     return pluginObj;
 
 };
 
-AbstractPluginLoader.prototype.trySetOptions = function(plugin, filename, options) {
-    var name = require('path').basename(filename);
+AbstractPluginLoader.prototype.trySetOptions = function(plugin, filename, name, options) {
     if (options) {
         if (!plugin.setOptions) {
             error("Options have been provided but the plugin " + name + " does not support any options.");
@@ -1484,21 +1528,21 @@ AbstractPluginLoader.prototype.trySetOptions = function(plugin, filename, option
         try {
             plugin.setOptions(options);
         }
-        catch(e) {
+        catch (e) {
             error("Error setting options on plugin " + name + '\n' + e.message);
             return null;
         }
     }
 };
 
-AbstractPluginLoader.prototype.validatePlugin = function(plugin, filename) {
+AbstractPluginLoader.prototype.validatePlugin = function(plugin, filename, name) {
     if (plugin) {
         // support plugins being a function
         // so that the plugin can be more usable programmatically
         if (typeof plugin === "function") {
             plugin = new plugin();
         }
-        var name = require('path').basename(filename);
+
         if (plugin.minVersion) {
             if (this.compareVersion(plugin.minVersion, this.less.version) < 0) {
                 error("Plugin " + name + " requires version " + this.versionToString(plugin.minVersion));
@@ -1541,7 +1585,12 @@ AbstractPluginLoader.prototype.printUsage = function(plugins) {
 module.exports = AbstractPluginLoader;
 
 
-},{"../functions/function-registry":24,"../less-error":34,"path":97}],18:[function(require,module,exports){
+},{"../functions/function-registry":26,"../less-error":36}],19:[function(require,module,exports){
+/**
+ * @todo Document why this abstraction exists, and the relationship between
+ *       environment, file managers, and plugin manager
+ */
+
 var logger = require("../logger");
 var environment = function(externalEnvironment, fileManagers) {
     this.fileManagers = fileManagers || [];
@@ -1594,7 +1643,24 @@ environment.prototype.clearFileManagers = function () {
 
 module.exports = environment;
 
-},{"../logger":35}],19:[function(require,module,exports){
+},{"../logger":37}],20:[function(require,module,exports){
+
+var functionRegistry = require("./function-registry"),
+    Anonymous = require("../tree/anonymous"),
+    Keyword = require("../tree/keyword");
+
+functionRegistry.addMultiple({
+    boolean: function(condition) {
+        return condition ? Keyword.True : Keyword.False;
+    },
+
+    'if': function(condition, trueValue, falseValue) {
+        return condition ? trueValue
+            : (falseValue || new Anonymous);
+    }
+});
+
+},{"../tree/anonymous":48,"../tree/keyword":68,"./function-registry":26}],21:[function(require,module,exports){
 var Color = require("../tree/color"),
     functionRegistry = require("./function-registry");
 
@@ -1670,7 +1736,7 @@ for (var f in colorBlendModeFunctions) {
 
 functionRegistry.addMultiple(colorBlend);
 
-},{"../tree/color":52,"./function-registry":24}],20:[function(require,module,exports){
+},{"../tree/color":53,"./function-registry":26}],22:[function(require,module,exports){
 var Dimension = require("../tree/dimension"),
     Color = require("../tree/color"),
     Quoted = require("../tree/quoted"),
@@ -1939,43 +2005,73 @@ colorFunctions = {
     greyscale: function (color) {
         return colorFunctions.desaturate(color, new Dimension(100));
     },
-    contrast: function (color, color1, color2, threshold) {
-        // Return which of `color1` and `color2` has the greatest contrast with `color`
-        // according to the standard WCAG contrast ratio calculation.
-        // http://www.w3.org/TR/WCAG20/#contrast-ratiodef
-        // The threshold param is no longer used, in line with SASS.
+    contrast: function (color, dark, light, threshold) {
         // filter: contrast(3.2);
         // should be kept as is, so check for color
         if (!color.rgb) {
             return null;
         }
-        if (typeof color1 === 'undefined') {
-            color1 = colorFunctions.rgba(0, 0, 0, 1.0);
+        if (typeof light === 'undefined') {
+            light = colorFunctions.rgba(255, 255, 255, 1.0);
         }
-        if (typeof color2 === 'undefined') {
-            color2 = colorFunctions.rgba(255, 255, 255, 1.0);
+        if (typeof dark === 'undefined') {
+            dark = colorFunctions.rgba(0, 0, 0, 1.0);
         }
-        var contrast1, contrast2;
-        var luma = color.luma();
-        var luma1 = color1.luma();
-        var luma2 = color2.luma();
-        // Calculate contrast ratios for each color
-        if (luma > luma1) {
-            contrast1 = (luma + 0.05) / (luma1 + 0.05);
-        } else {
-            contrast1 = (luma1 + 0.05) / (luma + 0.05);
+        // Figure out which is actually light and dark:
+        if (dark.luma() > light.luma()) {
+            var t = light;
+            light = dark;
+            dark = t;
         }
-        if (luma > luma2) {
-            contrast2 = (luma + 0.05) / (luma2 + 0.05);
+        if (typeof threshold === 'undefined') {
+            threshold = 0.43;
         } else {
-            contrast2 = (luma2 + 0.05) / (luma + 0.05);
+            threshold = number(threshold);
         }
-        if (contrast1 > contrast2) {
-            return color1;
+        if (color.luma() < threshold) {
+            return light;
         } else {
-            return color2;
-        }
-    },
+            return dark;
+        }
+    },
+    // Changes made in 2.7.0 - Reverted in 3.0.0
+    // contrast: function (color, color1, color2, threshold) {
+    //     // Return which of `color1` and `color2` has the greatest contrast with `color`
+    //     // according to the standard WCAG contrast ratio calculation.
+    //     // http://www.w3.org/TR/WCAG20/#contrast-ratiodef
+    //     // The threshold param is no longer used, in line with SASS.
+    //     // filter: contrast(3.2);
+    //     // should be kept as is, so check for color
+    //     if (!color.rgb) {
+    //         return null;
+    //     }
+    //     if (typeof color1 === 'undefined') {
+    //         color1 = colorFunctions.rgba(0, 0, 0, 1.0);
+    //     }
+    //     if (typeof color2 === 'undefined') {
+    //         color2 = colorFunctions.rgba(255, 255, 255, 1.0);
+    //     }
+    //     var contrast1, contrast2;
+    //     var luma = color.luma();
+    //     var luma1 = color1.luma();
+    //     var luma2 = color2.luma();
+    //     // Calculate contrast ratios for each color
+    //     if (luma > luma1) {
+    //         contrast1 = (luma + 0.05) / (luma1 + 0.05);
+    //     } else {
+    //         contrast1 = (luma1 + 0.05) / (luma + 0.05);
+    //     }
+    //     if (luma > luma2) {
+    //         contrast2 = (luma + 0.05) / (luma2 + 0.05);
+    //     } else {
+    //         contrast2 = (luma2 + 0.05) / (luma + 0.05);
+    //     }
+    //     if (contrast1 > contrast2) {
+    //         return color1;
+    //     } else {
+    //         return color2;
+    //     }
+    // },
     argb: function (color) {
         return new Anonymous(color.toARGB());
     },
@@ -2002,10 +2098,11 @@ colorFunctions = {
 };
 functionRegistry.addMultiple(colorFunctions);
 
-},{"../tree/anonymous":47,"../tree/color":52,"../tree/dimension":59,"../tree/quoted":76,"./function-registry":24}],21:[function(require,module,exports){
+},{"../tree/anonymous":48,"../tree/color":53,"../tree/dimension":60,"../tree/quoted":77,"./function-registry":26}],23:[function(require,module,exports){
 module.exports = function(environment) {
     var Quoted = require("../tree/quoted"),
         URL = require("../tree/url"),
+        utils = require('../utils'),
         functionRegistry = require("./function-registry"),
         fallback = function(functionThis, node) {
             return new URL(node, functionThis.index, functionThis.currentFileInfo).eval(functionThis.context);
@@ -2031,8 +2128,10 @@ module.exports = function(environment) {
             fragment = filePath.slice(fragmentStart);
             filePath = filePath.slice(0, fragmentStart);
         }
+        var context = utils.clone(this.context);
+        context.rawBuffer = true;
 
-        var fileManager = environment.getFileManager(filePath, currentDirectory, this.context, environment, true);
+        var fileManager = environment.getFileManager(filePath, currentDirectory, context, environment, true);
 
         if (!fileManager) {
             return fallback(this, filePathNode);
@@ -2058,7 +2157,7 @@ module.exports = function(environment) {
             useBase64 = /;base64$/.test(mimetype);
         }
 
-        var fileSync = fileManager.loadFileSync(filePath, currentDirectory, this.context, environment);
+        var fileSync = fileManager.loadFileSync(filePath, currentDirectory, context, environment);
         if (!fileSync.contents) {
             logger.warn("Skipped data-uri embedding of " + filePath + " because file not found");
             return fallback(this, filePathNode || mimetypeNode);
@@ -2089,7 +2188,7 @@ module.exports = function(environment) {
     });
 };
 
-},{"../logger":35,"../tree/quoted":76,"../tree/url":83,"./function-registry":24}],22:[function(require,module,exports){
+},{"../logger":37,"../tree/quoted":77,"../tree/url":82,"../utils":86,"./function-registry":26}],24:[function(require,module,exports){
 var Keyword = require("../tree/keyword"),
     functionRegistry = require("./function-registry");
 
@@ -2118,7 +2217,7 @@ functionRegistry.add("default", defaultFunc.eval.bind(defaultFunc));
 
 module.exports = defaultFunc;
 
-},{"../tree/keyword":68,"./function-registry":24}],23:[function(require,module,exports){
+},{"../tree/keyword":68,"./function-registry":26}],25:[function(require,module,exports){
 var Expression = require("../tree/expression");
 
 var functionCaller = function(name, context, index, currentFileInfo) {
@@ -2166,7 +2265,7 @@ functionCaller.prototype.call = function(args) {
 
 module.exports = functionCaller;
 
-},{"../tree/expression":62}],24:[function(require,module,exports){
+},{"../tree/expression":62}],26:[function(require,module,exports){
 function makeRegistry( base ) {
     return {
         _data: {},
@@ -2176,7 +2275,7 @@ function makeRegistry( base ) {
             name = name.toLowerCase();
 
             if (this._data.hasOwnProperty(name)) {
-                //TODO warn
+                // TODO warn
             }
             this._data[name] = func;
         },
@@ -2202,14 +2301,15 @@ function makeRegistry( base ) {
 }
 
 module.exports = makeRegistry( null );
-},{}],25:[function(require,module,exports){
+},{}],27:[function(require,module,exports){
 module.exports = function(environment) {
     var functions = {
         functionRegistry: require("./function-registry"),
         functionCaller: require("./function-caller")
     };
 
-    //register functions
+    // register functions
+    require("./boolean");
     require("./default");
     require("./color");
     require("./color-blending");
@@ -2223,7 +2323,7 @@ module.exports = function(environment) {
     return functions;
 };
 
-},{"./color":20,"./color-blending":19,"./data-uri":21,"./default":22,"./function-caller":23,"./function-registry":24,"./math":27,"./number":28,"./string":29,"./svg":30,"./types":31}],26:[function(require,module,exports){
+},{"./boolean":20,"./color":22,"./color-blending":21,"./data-uri":23,"./default":24,"./function-caller":25,"./function-registry":26,"./math":29,"./number":30,"./string":31,"./svg":32,"./types":33}],28:[function(require,module,exports){
 var Dimension = require("../tree/dimension");
 
 var MathHelper = function() {
@@ -2240,7 +2340,7 @@ MathHelper._math = function (fn, unit, n) {
     return new Dimension(fn(parseFloat(n.value)), unit);
 };
 module.exports = MathHelper;
-},{"../tree/dimension":59}],27:[function(require,module,exports){
+},{"../tree/dimension":60}],29:[function(require,module,exports){
 var functionRegistry = require("./function-registry"),
     mathHelper = require("./math-helper.js");
 
@@ -2271,7 +2371,7 @@ mathFunctions.round = function (n, f) {
 
 functionRegistry.addMultiple(mathFunctions);
 
-},{"./function-registry":24,"./math-helper.js":26}],28:[function(require,module,exports){
+},{"./function-registry":26,"./math-helper.js":28}],30:[function(require,module,exports){
 var Dimension = require("../tree/dimension"),
     Anonymous = require("../tree/anonymous"),
     functionRegistry = require("./function-registry"),
@@ -2279,7 +2379,7 @@ var Dimension = require("../tree/dimension"),
 
 var minMax = function (isMin, args) {
     args = Array.prototype.slice.call(args);
-    switch(args.length) {
+    switch (args.length) {
         case 0: throw { type: "Argument", message: "one or more arguments required" };
     }
     var i, j, current, currentUnified, referenceUnified, unit, unitStatic, unitClone,
@@ -2301,7 +2401,7 @@ var minMax = function (isMin, args) {
         j = values[""] !== undefined && unit !== "" && unit === unitStatic ? values[""] : values[unit];
         if (j === undefined) {
             if (unitStatic !== undefined && unit !== unitStatic) {
-                throw{ type: "Argument", message: "incompatible types" };
+                throw { type: "Argument", message: "incompatible types" };
             }
             values[unit] = order.length;
             order.push(current);
@@ -2354,7 +2454,7 @@ functionRegistry.addMultiple({
     }
 });
 
-},{"../tree/anonymous":47,"../tree/dimension":59,"./function-registry":24,"./math-helper.js":26}],29:[function(require,module,exports){
+},{"../tree/anonymous":48,"../tree/dimension":60,"./function-registry":26,"./math-helper.js":28}],31:[function(require,module,exports){
 var Quoted = require("../tree/quoted"),
     Anonymous = require("../tree/anonymous"),
     JavaScript = require("../tree/javascript"),
@@ -2376,12 +2476,12 @@ functionRegistry.addMultiple({
         result = result.replace(new RegExp(pattern.value, flags ? flags.value : ''), replacement);
         return new Quoted(string.quote || '', result, string.escaped);
     },
-    '%': function (string /* arg, arg, ...*/) {
+    '%': function (string /* arg, arg, ... */) {
         var args = Array.prototype.slice.call(arguments, 1),
             result = string.value;
 
         for (var i = 0; i < args.length; i++) {
-            /*jshint loopfunc:true */
+            /* jshint loopfunc:true */
             result = result.replace(/%[sda]/i, function(token) {
                 var value = ((args[i].type === "Quoted") &&
                     token.match(/s/i)) ? args[i].value : args[i].toCSS();
@@ -2393,7 +2493,7 @@ functionRegistry.addMultiple({
     }
 });
 
-},{"../tree/anonymous":47,"../tree/javascript":66,"../tree/quoted":76,"./function-registry":24}],30:[function(require,module,exports){
+},{"../tree/anonymous":48,"../tree/javascript":66,"../tree/quoted":77,"./function-registry":26}],32:[function(require,module,exports){
 module.exports = function(environment) {
     var Dimension = require("../tree/dimension"),
         Color = require("../tree/color"),
@@ -2411,12 +2511,12 @@ module.exports = function(environment) {
             renderEnv = {compress: false},
             returner,
             directionValue = direction.toCSS(renderEnv),
-			i, color, position, positionValue, alpha;
+            i, color, position, positionValue, alpha;
 
         function throwArgumentDescriptor() {
             throw { type: "Argument",
-					message: "svg-gradient expects direction, start_color [start_position], [color position,]...," +
-							" end_color [end_position] or direction, color list" };
+                message: "svg-gradient expects direction, start_color [start_position], [color position,]...," +
+                            " end_color [end_position] or direction, color list" };
         }
 
         if (arguments.length == 2) {
@@ -2457,7 +2557,7 @@ module.exports = function(environment) {
             '<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="100%" height="100%" viewBox="0 0 1 1" preserveAspectRatio="none">' +
             '<' + gradientType + 'Gradient id="gradient" gradientUnits="userSpaceOnUse" ' + gradientDirectionSvg + '>';
 
-        for (i = 0; i < stops.length; i+= 1) {
+        for (i = 0; i < stops.length; i += 1) {
             if (stops[i] instanceof Expression) {
                 color = stops[i].value[0];
                 position = stops[i].value[1];
@@ -2483,7 +2583,7 @@ module.exports = function(environment) {
     });
 };
 
-},{"../tree/color":52,"../tree/dimension":59,"../tree/expression":62,"../tree/quoted":76,"../tree/url":83,"./function-registry":24}],31:[function(require,module,exports){
+},{"../tree/color":53,"../tree/dimension":60,"../tree/expression":62,"../tree/quoted":77,"../tree/url":82,"./function-registry":26}],33:[function(require,module,exports){
 var Keyword = require("../tree/keyword"),
     DetachedRuleset = require("../tree/detached-ruleset"),
     Dimension = require("../tree/dimension"),
@@ -2574,10 +2674,12 @@ functionRegistry.addMultiple({
     }
 });
 
-},{"../tree/anonymous":47,"../tree/color":52,"../tree/detached-ruleset":58,"../tree/dimension":59,"../tree/keyword":68,"../tree/operation":74,"../tree/quoted":76,"../tree/url":83,"./function-registry":24}],32:[function(require,module,exports){
+},{"../tree/anonymous":48,"../tree/color":53,"../tree/detached-ruleset":59,"../tree/dimension":60,"../tree/keyword":68,"../tree/operation":74,"../tree/quoted":77,"../tree/url":82,"./function-registry":26}],34:[function(require,module,exports){
 var contexts = require("./contexts"),
     Parser = require('./parser/parser'),
-    LessError = require('./less-error');
+    LessError = require('./less-error'),
+    utils = require('./utils'),
+    PromiseConstructor = typeof Promise === 'undefined' ? require('promise') : Promise;
 
 module.exports = function(environment) {
 
@@ -2603,6 +2705,7 @@ module.exports = function(environment) {
         this.queue = [];        // Files which haven't been imported yet
         this.files = {};        // Holds the imported parse trees.
     };
+    
     /**
      * Add an import to be imported
      * @param path - the raw path
@@ -2625,7 +2728,9 @@ module.exports = function(environment) {
                 callback(null, {rules:[]}, false, null);
             }
             else {
-                importManager.files[fullPath] = root;
+                if (!importManager.files[fullPath]) {
+                    importManager.files[fullPath] = { root: root, options: importOptions };
+                } 
                 if (e && !importManager.error) { importManager.error = e; }
                 callback(e, root, importedEqualsRoot, fullPath);
             }
@@ -2645,10 +2750,6 @@ module.exports = function(environment) {
             return;
         }
 
-        if (tryAppendExtension) {
-            path = importOptions.isPlugin ? path : fileManager.tryAppendExtension(path, ".less");
-        }
-
         var loadFileCallback = function(loadedFile) {
             var plugin,
                 resolvedFilename = loadedFile.filename,
@@ -2684,7 +2785,7 @@ module.exports = function(environment) {
             }
 
             if (importOptions.isPlugin) {
-                plugin = pluginLoader.evalPlugin(contents, newEnv, importOptions.pluginArgs, newFileInfo);
+                plugin = pluginLoader.evalPlugin(contents, newEnv, importManager, importOptions.pluginArgs, newFileInfo);
                 if (plugin instanceof LessError) {
                     fileParsedFunc(plugin, null, resolvedFilename);
                 }
@@ -2694,44 +2795,55 @@ module.exports = function(environment) {
             } else if (importOptions.inline) {
                 fileParsedFunc(null, contents, resolvedFilename);
             } else {
-                new Parser(newEnv, importManager, newFileInfo).parse(contents, function (e, root) {
-                    fileParsedFunc(e, root, resolvedFilename);
-                });
-            }
-        };
-        var promise;
-        var done = function(err, loadedFile) {
-            if (err) {
-                fileParsedFunc(err);
-            } else {
-                loadFileCallback(loadedFile);
+                
+                // import (multiple) parse trees apparently get altered and can't be cached.
+                // TODO: investigate why this is
+                if (importManager.files[resolvedFilename] 
+                    && !importManager.files[resolvedFilename].options.multiple
+                    && !importOptions.multiple) {
+
+                    fileParsedFunc(null, importManager.files[resolvedFilename].root, resolvedFilename);
+                }
+                else {
+                    new Parser(newEnv, importManager, newFileInfo).parse(contents, function (e, root) {
+                        fileParsedFunc(e, root, resolvedFilename);
+                    });
+                }
             }
         };
+        var promise, context = utils.clone(this.context);
+
+        if (tryAppendExtension) {
+            context.ext = importOptions.isPlugin ? ".js" : ".less";
+        }
+
         if (importOptions.isPlugin) {
-            try {
-                pluginLoader.tryLoadPlugin(path, currentFileInfo.currentDirectory, done);
-            }
-            catch(e) {
-                callback(e);
-            }
+            promise = pluginLoader.loadPlugin(path, currentFileInfo.currentDirectory, context, environment, fileManager);
         }
         else {
-            promise = fileManager.loadFile(path, currentFileInfo.currentDirectory, this.context, environment, done);
-            if (promise) {
-                promise.then(loadFileCallback, fileParsedFunc);
-            }
+            promise = fileManager.loadFile(path, currentFileInfo.currentDirectory, context, environment, 
+                function(err, loadedFile) {
+                    if (err) {
+                        fileParsedFunc(err);
+                    } else {
+                        loadFileCallback(loadedFile);
+                    }
+                });
         }
-        
+        if (promise) {
+            promise.then(loadFileCallback, fileParsedFunc);
+        }
+
     };
     return ImportManager;
 };
 
-},{"./contexts":12,"./less-error":34,"./parser/parser":40}],33:[function(require,module,exports){
+},{"./contexts":12,"./less-error":36,"./parser/parser":42,"./utils":86,"promise":undefined}],35:[function(require,module,exports){
 module.exports = function(environment, fileManagers) {
     var SourceMapOutput, SourceMapBuilder, ParseTree, ImportManager, Environment;
 
-    var less = {
-        version: [3, 0, 0],
+    var initial = {
+        version: [3, 0, 1],
         data: require('./data'),
         tree: require('./tree'),
         Environment: (Environment = require("./environment/environment")),
@@ -2755,41 +2867,104 @@ module.exports = function(environment, fileManagers) {
         logger: require('./logger')
     };
 
-    return less;
-};
+    // Create a public API
 
-},{"./contexts":12,"./data":14,"./environment/abstract-file-manager":16,"./environment/abstract-plugin-loader":17,"./environment/environment":18,"./functions":25,"./import-manager":32,"./less-error":34,"./logger":35,"./parse":37,"./parse-tree":36,"./parser/parser":40,"./plugin-manager":41,"./render":42,"./source-map-builder":43,"./source-map-output":44,"./transform-tree":45,"./tree":65,"./utils":86,"./visitors":90}],34:[function(require,module,exports){
-var utils = require("./utils");
+    var ctor = function(t) {
+        return function() {
+            var obj = Object.create(t.prototype);
+            t.apply(obj, Array.prototype.slice.call(arguments, 0));
+            return obj;
+        };
+    };
+    var t, api = Object.create(initial);
+    for (var n in initial.tree) {
+        /* eslint guard-for-in: 0 */
+        t = initial.tree[n];
+        if (typeof t === "function") {
+            api[n.toLowerCase()] = ctor(t);
+        }
+        else {
+            api[n] = Object.create(null);
+            for (var o in t) {
+                /* eslint guard-for-in: 0 */
+                api[n][o.toLowerCase()] = ctor(t[o]);
+            }
+        }
+    }
 
-var LessError = module.exports = function LessError(e, importManager, currentFilename) {
+    return api;
+};
 
+},{"./contexts":12,"./data":14,"./environment/abstract-file-manager":17,"./environment/abstract-plugin-loader":18,"./environment/environment":19,"./functions":27,"./import-manager":34,"./less-error":36,"./logger":37,"./parse":39,"./parse-tree":38,"./parser/parser":42,"./plugin-manager":43,"./render":44,"./source-map-builder":45,"./source-map-output":46,"./transform-tree":47,"./tree":65,"./utils":86,"./visitors":90}],36:[function(require,module,exports){
+var utils = require('./utils');
+/**
+ * This is a centralized class of any error that could be thrown internally (mostly by the parser).
+ * Besides standard .message it keeps some additional data like a path to the file where the error
+ * occurred along with line and column numbers.
+ *
+ * @class
+ * @extends Error
+ * @type {module.LessError}
+ *
+ * @prop {string} type
+ * @prop {string} filename
+ * @prop {number} index
+ * @prop {number} line
+ * @prop {number} column
+ * @prop {number} callLine
+ * @prop {number} callExtract
+ * @prop {string[]} extract
+ *
+ * @param {Object} e              - An error object to wrap around or just a descriptive object
+ * @param {Object} fileContentMap - An object with file contents in 'contents' property (like importManager) @todo - move to fileManager?
+ * @param {string} [currentFilename]
+ */
+var LessError = module.exports = function LessError(e, fileContentMap, currentFilename) {
     Error.call(this);
 
     var filename = e.filename || currentFilename;
 
-    if (importManager && filename) {
-        var input = importManager.contents[filename],
+    this.message = e.message;
+    this.stack = e.stack;
+
+    if (fileContentMap && filename) {
+        var input = fileContentMap.contents[filename],
             loc = utils.getLocation(e.index, input),
             line = loc.line,
             col  = loc.column,
             callLine = e.call && utils.getLocation(e.call, input).line,
-            lines = input.split('\n');
+            lines = input ? input.split('\n') : '';
 
         this.type = e.type || 'Syntax';
         this.filename = filename;
         this.index = e.index;
         this.line = typeof line === 'number' ? line + 1 : null;
+        this.column = col;
+
+        if (!this.line && this.stack) {
+            var found = this.stack.match(/(<anonymous>|Function):(\d+):(\d+)/);
+
+            if (found) {
+                if (found[2]) {
+                    this.line = parseInt(found[2]) - 2;
+                }
+                if (found[3]) {
+                    this.column = parseInt(found[3]);
+                }
+            }
+        }
+
         this.callLine = callLine + 1;
         this.callExtract = lines[callLine];
-        this.column = col;
+
         this.extract = [
-            lines[line - 1],
-            lines[line],
-            lines[line + 1]
+            lines[this.line - 2],
+            lines[this.line - 1],
+            lines[this.line]
         ];
+
     }
-    this.message = e.message;
-    this.stack = e.stack;
+
 };
 
 if (typeof Object.create === 'undefined') {
@@ -2802,7 +2977,68 @@ if (typeof Object.create === 'undefined') {
 
 LessError.prototype.constructor = LessError;
 
-},{"./utils":86}],35:[function(require,module,exports){
+/**
+ * An overridden version of the default Object.prototype.toString
+ * which uses additional information to create a helpful message.
+ *
+ * @param {Object} options
+ * @returns {string}
+ */
+LessError.prototype.toString = function(options) {
+    options = options || {};
+
+    var message = '';
+    var extract = this.extract || [];
+    var error = [];
+    var stylize = function (str) { return str; };
+    if (options.stylize) {
+        var type = typeof options.stylize;
+        if (type !== 'function') {
+            throw Error('options.stylize should be a function, got a ' + type + '!');
+        }
+        stylize = options.stylize;
+    }
+
+    if (this.line !== null) {
+        if (typeof extract[0] === 'string') {
+            error.push(stylize((this.line - 1) + ' ' + extract[0], 'grey'));
+        }
+
+        if (typeof extract[1] === 'string') {
+            var errorTxt = this.line + ' ';
+            if (extract[1]) {
+                errorTxt += extract[1].slice(0, this.column) +
+                    stylize(stylize(stylize(extract[1].substr(this.column, 1), 'bold') +
+                        extract[1].slice(this.column + 1), 'red'), 'inverse');
+            }
+            error.push(errorTxt);
+        }
+
+        if (typeof extract[2] === 'string') {
+            error.push(stylize((this.line + 1) + ' ' + extract[2], 'grey'));
+        }
+        error = error.join('\n') + stylize('', 'reset') + '\n';
+    }
+
+    message += stylize(this.type + 'Error: ' + this.message, 'red');
+    if (this.filename) {
+        message += stylize(' in ', 'red') + this.filename;
+    }
+    if (this.line) {
+        message += stylize(' on line ' + this.line + ', column ' + (this.column + 1) + ':', 'grey');
+    }
+
+    message += '\n' + error;
+
+    if (this.callLine) {
+        message += stylize('from ', 'red') + (this.filename || '') + '/n';
+        message += stylize(this.callLine, 'grey') + ' ' + this.callExtract + '/n';
+    }
+
+    return message;
+};
+
+},{"./utils":86}],37:[function(require,module,exports){
 module.exports = {
     error: function(msg) {
         this._fireEvent("error", msg);
@@ -2838,7 +3074,7 @@ module.exports = {
     _listeners: []
 };
 
-},{}],36:[function(require,module,exports){
+},{}],38:[function(require,module,exports){
 var LessError = require('./less-error'),
     transformTree = require("./transform-tree"),
     logger = require("./logger");
@@ -2900,20 +3136,23 @@ module.exports = function(SourceMapBuilder) {
     return ParseTree;
 };
 
-},{"./less-error":34,"./logger":35,"./transform-tree":45}],37:[function(require,module,exports){
+},{"./less-error":36,"./logger":37,"./transform-tree":47}],39:[function(require,module,exports){
 var PromiseConstructor,
     contexts = require("./contexts"),
     Parser = require('./parser/parser'),
     PluginManager = require('./plugin-manager'),
-    LessError = require('./less-error');
+    LessError = require('./less-error'),
+    utils = require('./utils');
 
 module.exports = function(environment, ParseTree, ImportManager) {
     var parse = function (input, options, callback) {
-        options = options || {};
 
         if (typeof options === 'function') {
             callback = options;
-            options = {};
+            options = utils.defaults(this.options, {});
+        }
+        else {
+            options = utils.defaults(this.options, options || {});
         }
 
         if (!callback) {
@@ -2933,7 +3172,7 @@ module.exports = function(environment, ParseTree, ImportManager) {
         } else {
             var context,
                 rootFileInfo,
-                pluginManager = new PluginManager(this, true);
+                pluginManager = new PluginManager(this, !options.reUsePluginManager);
 
             options.pluginManager = pluginManager;
 
@@ -2959,38 +3198,38 @@ module.exports = function(environment, ParseTree, ImportManager) {
             }
 
             var imports = new ImportManager(this, context, rootFileInfo);
-            
+            this.importManager = imports;
+
+            // TODO: allow the plugins to be just a list of paths or names
+            // Do an async plugin queue like lessc
+
             if (options.plugins) {
                 options.plugins.forEach(function(plugin) {
                     var evalResult, contents;
                     if (plugin.fileContent) {
                         contents = plugin.fileContent.replace(/^\uFEFF/, '');
-                        evalResult = pluginManager.Loader.evalPlugin(contents, context, plugin.options, plugin.filename);
-                        if (!(evalResult instanceof LessError)) {
-                            pluginManager.addPlugin(plugin);
-                        }
-                        else {
+                        evalResult = pluginManager.Loader.evalPlugin(contents, context, imports, plugin.options, plugin.filename);
+                        if (evalResult instanceof LessError) {
                             return callback(evalResult);
                         }
-                        
                     }
                     else {
                         pluginManager.addPlugin(plugin);
                     }
                 });
             }
-            
+
             new Parser(context, imports, rootFileInfo)
                 .parse(input, function (e, root) {
-                if (e) { return callback(e); }
-                callback(null, root, imports, options);
-            }, options);
+                    if (e) { return callback(e); }
+                    callback(null, root, imports, options);
+                }, options);
         }
     };
     return parse;
 };
 
-},{"./contexts":12,"./less-error":34,"./parser/parser":40,"./plugin-manager":41,"promise":undefined}],38:[function(require,module,exports){
+},{"./contexts":12,"./less-error":36,"./parser/parser":42,"./plugin-manager":43,"./utils":86,"promise":undefined}],40:[function(require,module,exports){
 // Split the input into chunks.
 module.exports = function (input, fail) {
     var len = input.length, level = 0, parenLevel = 0,
@@ -3104,15 +3343,15 @@ module.exports = function (input, fail) {
     return chunks;
 };
 
-},{}],39:[function(require,module,exports){
+},{}],41:[function(require,module,exports){
 var chunker = require('./chunker');
 
 module.exports = function() {
-    var input,       // LeSS input string
+    var input,       // Less input string
         j,           // current chunk
         saveStack = [],   // holds state for backtracking
         furthest,    // furthest index the parser has gone to
-        furthestPossibleErrorMessage,// if this is furthest we got to, this is the probably cause
+        furthestPossibleErrorMessage, // if this is furthest we got to, this is the probably cause
         chunks,      // chunkified input
         current,     // current chunk
         currentPos,  // index of current chunk, in `input`
@@ -3263,7 +3502,7 @@ module.exports = function() {
 
         for (var i = 1; i + currentPosition < length; i++) {
             var nextChar = input.charAt(i + currentPosition);
-            switch(nextChar) {
+            switch (nextChar) {
                 case "\\":
                     i++;
                     continue;
@@ -3316,7 +3555,7 @@ module.exports = function() {
 
     parserInput.peekNotNumeric = function() {
         var c = input.charCodeAt(parserInput.i);
-        //Is the first char of the dimension 0-9, '.', '+' or '-'
+        // Is the first char of the dimension 0-9, '.', '+' or '-'
         return (c > CHARCODE_9 || c < CHARCODE_PLUS) || c === CHARCODE_FORWARD_SLASH || c === CHARCODE_COMMA;
     };
 
@@ -3365,12 +3604,13 @@ module.exports = function() {
     return parserInput;
 };
 
-},{"./chunker":38}],40:[function(require,module,exports){
+},{"./chunker":40}],42:[function(require,module,exports){
 var LessError = require('../less-error'),
     tree = require("../tree"),
     visitors = require("../visitors"),
     getParserInput = require("./parser-input"),
-    utils = require("../utils");
+    utils = require("../utils"),
+    functionRegistry = require('../functions/function-registry');
 
 //
 // less.js - parser
@@ -3403,8 +3643,8 @@ var LessError = require('../less-error'),
 //    Token matching is done with the `$` function, which either takes
 //    a terminal string or regexp, or a non-terminal function to call.
 //    It also takes care of moving all the indices forwards.
-//`
 //
+
 var Parser = function Parser(context, imports, fileInfo) {
     var parsers,
         parserInput = getParserInput();
@@ -3448,11 +3688,61 @@ var Parser = function Parser(context, imports, fileInfo) {
         };
     }
 
+    /**
+     *  Used after initial parsing to create nodes on the fly
+     * 
+     *  @param {String} str          - string to parse 
+     *  @param {Array}  parseList    - array of parsers to run input through e.g. ["value", "important"]
+     *  @param {Number} currentIndex - start number to begin indexing
+     *  @param {Object} fileInfo     - fileInfo to attach to created nodes
+     */
+    function parseNode(str, parseList, currentIndex, fileInfo, callback) {
+        var result, returnNodes = [];
+        var parser = parserInput;
+
+        try {
+            parser.start(str, false, function fail(msg, index) {
+                callback({
+                    message: msg,
+                    index: index + currentIndex
+                });
+            });
+            for (var x = 0, p, i; (p = parseList[x]); x++) {
+                i = parser.i;
+                result = parsers[p]();
+                if (result) {
+                    result._index = i + currentIndex;
+                    result._fileInfo = fileInfo;
+                    returnNodes.push(result);
+                }
+                else {
+                    returnNodes.push(null);
+                }
+            }
+
+            var endInfo = parser.end();
+            if (endInfo.isFinished) {
+                callback(null, returnNodes);
+            }
+            else {
+                callback(true, null);
+            }
+        } catch (e) {
+            throw new LessError({
+                index: e.index + currentIndex,
+                message: e.message
+            }, imports, fileInfo.filename);
+        }
+    }
+    
     //
     // The Parser
     //
     return {
-
+        parserInput: parserInput,
+        imports: imports,
+        fileInfo: fileInfo,
+        parseNode: parseNode,
         //
         // Parse an input string into an abstract syntax tree,
         // @param str A string containing 'less' markup
@@ -3498,9 +3788,13 @@ var Parser = function Parser(context, imports, fileInfo) {
                     }, imports);
                 });
 
-                root = new(tree.Ruleset)(null, this.parsers.primary());
+                tree.Node.prototype.parse = this;
+                root = new tree.Ruleset(null, this.parsers.primary());
+                tree.Node.prototype.rootNode = root;
                 root.root = true;
                 root.firstRoot = true;
+                root.functionRegistry = functionRegistry.inherit();
+                
             } catch (e) {
                 return callback(new LessError(e, imports, fileInfo.filename));
             }
@@ -3629,7 +3923,7 @@ var Parser = function Parser(context, imports, fileInfo) {
                     }
 
                     node = mixin.definition() || this.declaration() || this.ruleset() ||
-                        mixin.call() || this.rulesetCall() || this.entities.call() || this.atrule();
+                        mixin.call() || this.variableCall() || this.entities.call() || this.atrule();
                     if (node) {
                         root.push(node);
                     } else {
@@ -3687,7 +3981,7 @@ var Parser = function Parser(context, imports, fileInfo) {
                 //     black border-collapse
                 //
                 keyword: function () {
-                    var k = parserInput.$char("%") || parserInput.$re(/^[_A-Za-z-][_A-Za-z0-9-]*/);
+                    var k = parserInput.$char("%") || parserInput.$re(/^\[?[_A-Za-z-][_A-Za-z0-9-]*\]?/);
                     if (k) {
                         return tree.Color.fromKeyword(k) || new(tree.Keyword)(k);
                     }
@@ -3698,13 +3992,10 @@ var Parser = function Parser(context, imports, fileInfo) {
                 //
                 //     rgb(255, 0, 255)
                 //
-                // We also try to catch IE's `alpha()`, but let the `alpha` parser
-                // deal with the details.
-                //
                 // The arguments are parsed with the `entities.arguments` parser.
                 //
                 call: function () {
-                    var name, nameLC, args, alpha, index = parserInput.i;
+                    var name, args, func, index = parserInput.i;
 
                     // http://jsperf.com/case-insensitive-regex-vs-strtolower-then-regex/18
                     if (parserInput.peek(/^url\(/i)) {
@@ -3714,70 +4005,98 @@ var Parser = function Parser(context, imports, fileInfo) {
                     parserInput.save();
 
                     name = parserInput.$re(/^([\w-]+|%|progid:[\w\.]+)\(/);
-                    if (!name) { parserInput.forget(); return; }
+                    if (!name) {
+                        parserInput.forget(); 
+                        return;
+                    }
 
                     name = name[1];
-                    nameLC = name.toLowerCase();
-
-                    if (nameLC === 'alpha') {
-                        alpha = parsers.alpha();
-                        if (alpha) {
+                    func = this.customFuncCall(name);
+                    if (func) {
+                        args = func.parse();
+                        if (args && func.stop) {
                             parserInput.forget();
-                            return alpha;
+                            return args;
                         }
                     }
 
-                    args = this.arguments();
+                    args = this.arguments(args);
 
-                    if (! parserInput.$char(')')) {
+                    if (!parserInput.$char(')')) {
                         parserInput.restore("Could not parse call arguments or missing ')'");
                         return;
                     }
 
                     parserInput.forget();
+                    
                     return new(tree.Call)(name, args, index, fileInfo);
                 },
-                arguments: function () {
-                    var argsSemiColon = [], argsComma = [],
-                        expressions = [],
-                        isSemiColonSeparated, value, arg;
-
-                    parserInput.save();
+                
+                //
+                // Parsing rules for functions with non-standard args, e.g.:
+                //
+                //     boolean(not(2 > 1))
+                //
+                //     This is a quick prototype, to be modified/improved when
+                //     more custom-parsed funcs come (e.g. `selector(...)`)
+                //
 
-                    while (true) {
+                customFuncCall: function (name) {
+                    /* Ideally the table is to be moved out of here for faster perf.,
+                       but it's quite tricky since it relies on all these `parsers`
+                       and `expect` available only here */
+                    return {
+                        alpha:   f(parsers.ieAlpha, true),
+                        boolean: f(condition),
+                        'if':    f(condition)
+                    }[name.toLowerCase()];
+
+                    function f(parse, stop) {
+                        return {
+                            parse: parse, // parsing function
+                            stop:  stop   // when true - stop after parse() and return its result, 
+                                          // otherwise continue for plain args
+                        };
+                    }
+                
+                    function condition() {
+                        return [expect(parsers.condition, 'expected condition')];
+                    }
+                },
 
-                        arg = parsers.detachedRuleset() || this.assignment() || parsers.expression();
+                arguments: function (prevArgs) {
+                    var argsComma = prevArgs || [],
+                        argsSemiColon = [],
+                        isSemiColonSeparated, value;
 
-                        if (!arg) {
-                            break;
-                        }
+                    parserInput.save();
 
-                        value = arg;
+                    while (true) {
+                        if (prevArgs) {
+                            prevArgs = false;
+                        } else {
+                            value = parsers.detachedRuleset() || this.assignment() || parsers.expression();
+                            if (!value) {
+                                break;
+                            }
 
-                        if (arg.value && arg.value.length == 1) {
-                            value = arg.value[0];
-                        }
+                            if (value.value && value.value.length == 1) {
+                                value = value.value[0];
+                            }
 
-                        if (value) {
-                            expressions.push(value);
+                            argsComma.push(value);
                         }
 
-                        argsComma.push(value);
-
                         if (parserInput.$char(',')) {
                             continue;
                         }
 
                         if (parserInput.$char(';') || isSemiColonSeparated) {
-
                             isSemiColonSeparated = true;
-
-                            if (expressions.length > 1) {
-                                value = new(tree.Value)(expressions);
-                            }
+                            value = (argsComma.length < 1) ? argsComma[0]
+                                : new tree.Value(argsComma);
                             argsSemiColon.push(value);
-
-                            expressions = [];
+                            argsComma = [];
                         }
                     }
 
@@ -3835,15 +4154,17 @@ var Parser = function Parser(context, imports, fileInfo) {
                         return;
                     }
 
-                    value = this.quoted() || this.variable() ||
+                    value = this.quoted() || this.variable() || this.property() ||
                             parserInput.$re(/^(?:(?:\\[\(\)'"])|[^\(\)'"])+/) || "";
 
                     parserInput.autoCommentAbsorb = true;
 
                     expectChar(')');
 
-                    return new(tree.URL)((value.value != null || value instanceof tree.Variable) ?
-                                        value : new(tree.Anonymous)(value), index, fileInfo);
+                    return new(tree.URL)((value.value != null || 
+                        value instanceof tree.Variable || 
+                        value instanceof tree.Property) ?
+                        value : new(tree.Anonymous)(value, index), index, fileInfo);
                 },
 
                 //
@@ -3870,7 +4191,27 @@ var Parser = function Parser(context, imports, fileInfo) {
                         return new(tree.Variable)("@" + curly[1], index, fileInfo);
                     }
                 },
+                //
+                // A Property accessor, such as `$color`, in
+                //
+                //     background-color: $color
+                //
+                property: function () {
+                    var name, index = parserInput.i;
+
+                    if (parserInput.currentChar() === '$' && (name = parserInput.$re(/^\$[\w-]+/))) {
+                        return new(tree.Property)(name, index, fileInfo);
+                    }
+                },
+
+                // A property entity useing the protective {} e.g. ${prop}
+                propertyCurly: function () {
+                    var curly, index = parserInput.i;
 
+                    if (parserInput.currentChar() === '$' && (curly = parserInput.$re(/^\$\{([\w-]+)\}/))) {
+                        return new(tree.Property)("$" + curly[1], index, fileInfo);
+                    }
+                },
                 //
                 // A Hexadecimal color
                 //
@@ -3980,15 +4321,17 @@ var Parser = function Parser(context, imports, fileInfo) {
             },
 
             //
-            // The variable part of a variable definition. Used in the `rule` parser
+            // Call a variable value
             //
-            //     @fink();
+            //     @fink()
             //
-            rulesetCall: function () {
+            variableCall: function () {
                 var name;
 
-                if (parserInput.currentChar() === '@' && (name = parserInput.$re(/^(@[\w-]+)\(\s*\)\s*;/))) {
-                    return new tree.RulesetCall(name[1]);
+                if (parserInput.currentChar() === '@'
+                    && (name = parserInput.$re(/^(@[\w-]+)\(\s*\)/))
+                    && parsers.end()) {
+                    return new tree.VariableCall(name[1]);
                 }
             },
 
@@ -4005,7 +4348,7 @@ var Parser = function Parser(context, imports, fileInfo) {
                 do {
                     option = null;
                     elements = null;
-                    while (! (option = parserInput.$re(/^(all)(?=\s*(\)|,))/))) {
+                    while (!(option = parserInput.$re(/^(all)(?=\s*(\)|,))/))) {
                         e = this.element();
                         if (!e) {
                             break;
@@ -4124,7 +4467,7 @@ var Parser = function Parser(context, imports, fileInfo) {
                                     .push({ variadic: true });
                                 break;
                             }
-                            arg = entities.variable() || entities.literal() || entities.keyword();
+                            arg = entities.variable() || entities.property() || entities.literal() || entities.keyword();
                         }
 
                         if (!arg) {
@@ -4147,7 +4490,7 @@ var Parser = function Parser(context, imports, fileInfo) {
                             val = arg;
                         }
 
-                        if (val && val instanceof tree.Variable) {
+                        if (val && (val instanceof tree.Variable || val instanceof tree.Property)) {
                             if (parserInput.$char(':')) {
                                 if (expressions.length > 0) {
                                     if (isSemiColonSeparated) {
@@ -4293,7 +4636,7 @@ var Parser = function Parser(context, imports, fileInfo) {
                 var entities = this.entities;
 
                 return this.comment() || entities.literal() || entities.variable() || entities.url() ||
-                       entities.call()    || entities.keyword()  || entities.javascript();
+                       entities.property() || entities.call() || entities.keyword()  || entities.javascript();
             },
 
             //
@@ -4310,17 +4653,18 @@ var Parser = function Parser(context, imports, fileInfo) {
             //
             //     alpha(opacity=88)
             //
-            alpha: function () {
+            ieAlpha: function () {
                 var value;
 
                 // http://jsperf.com/case-insensitive-regex-vs-strtolower-then-regex/18
-                if (! parserInput.$re(/^opacity=/i)) { return; }
+                if (!parserInput.$re(/^opacity=/i)) { return; }
                 value = parserInput.$re(/^\d+/);
                 if (!value) {
-                    value = expect(this.entities.variable, "Could not parse alpha");
+                    value = expect(parsers.entities.variable, "Could not parse alpha");
+                    value = '@{' + value.name.slice(1) + '}';
                 }
                 expectChar(')');
-                return new(tree.Alpha)(value);
+                return new tree.Quoted('', 'alpha(opacity=' + value + ')');
             },
 
             //
@@ -4346,10 +4690,10 @@ var Parser = function Parser(context, imports, fileInfo) {
                     parserInput.$re(/^\([^&()@]+\)/) ||  parserInput.$re(/^[\.#:](?=@)/) ||
                     this.entities.variableCurly();
 
-                if (! e) {
+                if (!e) {
                     parserInput.save();
                     if (parserInput.$char('(')) {
-                        if ((v = this.selector()) && parserInput.$char(')')) {
+                        if ((v = this.selector(false)) && parserInput.$char(')')) {
                             e = new(tree.Paren)(v);
                             parserInput.forget();
                         } else {
@@ -4400,14 +4744,8 @@ var Parser = function Parser(context, imports, fileInfo) {
                 }
             },
             //
-            // A CSS selector (see selector below)
-            // with less extensions e.g. the ability to extend and guard
-            //
-            lessSelector: function () {
-                return this.selector(true);
-            },
-            //
             // A CSS Selector
+            // with less extensions e.g. the ability to extend and guard
             //
             //     .class > div + h1
             //     li a:hover
@@ -4416,7 +4754,7 @@ var Parser = function Parser(context, imports, fileInfo) {
             //
             selector: function (isLess) {
                 var index = parserInput.i, elements, extendList, c, e, allExtends, when, condition;
-
+                isLess = isLess !== false;
                 while ((isLess && (extendList = this.extend())) || (isLess && (when = parserInput.$str("when"))) || (e = this.element())) {
                     if (when) {
                         condition = expect(this.conditions, 'expected condition');
@@ -4447,7 +4785,7 @@ var Parser = function Parser(context, imports, fileInfo) {
                 if (allExtends) { error("Extend must be used to extend a selector, it cannot be used on its own"); }
             },
             attribute: function () {
-                if (! parserInput.$char('[')) { return; }
+                if (!parserInput.$char('[')) { return; }
 
                 var entities = this.entities,
                     key, val, op;
@@ -4506,7 +4844,7 @@ var Parser = function Parser(context, imports, fileInfo) {
                 }
 
                 while (true) {
-                    s = this.lessSelector();
+                    s = this.selector();
                     if (!s) {
                         break;
                     }
@@ -4519,7 +4857,7 @@ var Parser = function Parser(context, imports, fileInfo) {
                     if (s.condition && selectors.length > 1) {
                         error("Guards are only currently allowed on a single selector.");
                     }
-                    if (! parserInput.$char(',')) { break; }
+                    if (!parserInput.$char(',')) { break; }
                     if (s.condition) {
                         error("Guards are only currently allowed on a single selector.");
                     }
@@ -4537,7 +4875,7 @@ var Parser = function Parser(context, imports, fileInfo) {
                     parserInput.restore();
                 }
             },
-            declaration: function (tryAnonymous) {
+            declaration: function () {
                 var name, value, startOfRule = parserInput.i, c = parserInput.currentChar(), important, merge, isVariable;
 
                 if (c === '.' || c === '#' || c === '&' || c === ':') { return; }
@@ -4559,22 +4897,16 @@ var Parser = function Parser(context, imports, fileInfo) {
                         // where each item is a tree.Keyword or tree.Variable
                         merge = !isVariable && name.length > 1 && name.pop().value;
 
-                        // prefer to try to parse first if its a variable or we are compressing
-                        // but always fallback on the other one
-                        var tryValueFirst = !tryAnonymous && (context.compress || isVariable);
-
-                        if (tryValueFirst) {
-                            value = this.value();
+                        // Try to store values as anonymous
+                        // If we need the value later we'll re-parse it in ruleset.parseValue
+                        value = this.anonymousValue();
+                        if (value) {
+                            parserInput.forget();
+                            // anonymous values absorb the end ';' which is required for them to work
+                            return new (tree.Declaration)(name, value, false, merge, startOfRule, fileInfo);
                         }
+
                         if (!value) {
-                            value = this.anonymousValue();
-                            if (value) {
-                                parserInput.forget();
-                                // anonymous values absorb the end ';' which is required for them to work
-                                return new (tree.Declaration)(name, value, false, merge, startOfRule, fileInfo);
-                            }
-                        }
-                        if (!tryValueFirst && !value) {
                             value = this.value();
                         }
 
@@ -4584,20 +4916,19 @@ var Parser = function Parser(context, imports, fileInfo) {
                     if (value && this.end()) {
                         parserInput.forget();
                         return new (tree.Declaration)(name, value, important, merge, startOfRule, fileInfo);
-                    } else {
+                    }
+                    else {
                         parserInput.restore();
-                        if (value && !tryAnonymous) {
-                            return this.declaration(true);
-                        }
                     }
                 } else {
-                    parserInput.forget();
+                    parserInput.restore();
                 }
             },
             anonymousValue: function () {
-                var match = parserInput.$re(/^([^@+\/'"*`(;{}-]*);/);
+                var index = parserInput.i;
+                var match = parserInput.$re(/^([^@\$+\/'"*`(;{}-]*);/);
                 if (match) {
-                    return new(tree.Anonymous)(match[1]);
+                    return new(tree.Anonymous)(match[1], index);
                 }
             },
 
@@ -4640,13 +4971,13 @@ var Parser = function Parser(context, imports, fileInfo) {
                 var o, options = {}, optionName, value;
 
                 // list of options, surrounded by parens
-                if (! parserInput.$char('(')) { return null; }
+                if (!parserInput.$char('(')) { return null; }
                 do {
                     o = this.importOption();
                     if (o) {
                         optionName = o;
                         value = true;
-                        switch(optionName) {
+                        switch (optionName) {
                             case "css":
                                 optionName = "less";
                                 value = false;
@@ -4657,7 +4988,7 @@ var Parser = function Parser(context, imports, fileInfo) {
                                 break;
                         }
                         options[optionName] = value;
-                        if (! parserInput.$char(',')) { break; }
+                        if (!parserInput.$char(',')) { break; }
                     }
                 } while (o);
                 expectChar(')');
@@ -4707,12 +5038,12 @@ var Parser = function Parser(context, imports, fileInfo) {
                     e = this.mediaFeature();
                     if (e) {
                         features.push(e);
-                        if (! parserInput.$char(',')) { break; }
+                        if (!parserInput.$char(',')) { break; }
                     } else {
                         e = entities.variable();
                         if (e) {
                             features.push(e);
-                            if (! parserInput.$char(',')) { break; }
+                            if (!parserInput.$char(',')) { break; }
                         }
                     }
                 } while (e);
@@ -4793,7 +5124,7 @@ var Parser = function Parser(context, imports, fileInfo) {
             pluginArgs: function() {
                 // list of options, surrounded by parens
                 parserInput.save();
-                if (! parserInput.$char('(')) {
+                if (!parserInput.$char('(')) {
                     parserInput.restore();
                     return null;
                 }
@@ -4835,7 +5166,7 @@ var Parser = function Parser(context, imports, fileInfo) {
                     nonVendorSpecificName = "@" + name.slice(name.indexOf('-', 2) + 1);
                 }
 
-                switch(nonVendorSpecificName) {
+                switch (nonVendorSpecificName) {
                     case "@charset":
                         hasIdentifier = true;
                         hasBlock = false;
@@ -4902,18 +5233,18 @@ var Parser = function Parser(context, imports, fileInfo) {
             // and before the `;`.
             //
             value: function () {
-                var e, expressions = [];
+                var e, expressions = [], index = parserInput.i;
 
                 do {
                     e = this.expression();
                     if (e) {
                         expressions.push(e);
-                        if (! parserInput.$char(',')) { break; }
+                        if (!parserInput.$char(',')) { break; }
                     }
                 } while (e);
 
                 if (expressions.length > 0) {
-                    return new(tree.Value)(expressions);
+                    return new(tree.Value)(expressions, index);
                 }
             },
             important: function () {
@@ -5152,13 +5483,14 @@ var Parser = function Parser(context, imports, fileInfo) {
             operand: function () {
                 var entities = this.entities, negate;
 
-                if (parserInput.peek(/^-[@\(]/)) {
+                if (parserInput.peek(/^-[@\$\(]/)) {
                     negate = parserInput.$char('-');
                 }
 
                 var o = this.sub() || entities.dimension() ||
                         entities.color() || entities.variable() ||
-                        entities.call() || entities.colorKeyword();
+                        entities.property() || entities.call() ||
+                        entities.colorKeyword();
 
                 if (negate) {
                     o.parensInOp = true;
@@ -5176,7 +5508,7 @@ var Parser = function Parser(context, imports, fileInfo) {
             //     @var * 2
             //
             expression: function () {
-                var entities = [], e, delim;
+                var entities = [], e, delim, index = parserInput.i;
 
                 do {
                     e = this.comment();
@@ -5191,7 +5523,7 @@ var Parser = function Parser(context, imports, fileInfo) {
                         if (!parserInput.peek(/^\/[\/*]/)) {
                             delim = parserInput.$char('/');
                             if (delim) {
-                                entities.push(new(tree.Anonymous)(delim));
+                                entities.push(new(tree.Anonymous)(delim, index));
                             }
                         }
                     }
@@ -5229,7 +5561,7 @@ var Parser = function Parser(context, imports, fileInfo) {
 
                 match(/^(\*?)/);
                 while (true) {
-                    if (!match(/^((?:[\w-]+)|(?:@\{[\w-]+\}))/)) {
+                    if (!match(/^((?:[\w-]+)|(?:[@\$]\{[\w-]+\}))/)) {
                         break;
                     }
                 }
@@ -5245,10 +5577,11 @@ var Parser = function Parser(context, imports, fileInfo) {
                     }
                     for (k = 0; k < name.length; k++) {
                         s = name[k];
-                        name[k] = (s.charAt(0) !== '@') ?
+                        name[k] = (s.charAt(0) !== '@' && s.charAt(0) !== '$') ?
                             new(tree.Keyword)(s) :
-                            new(tree.Variable)('@' + s.slice(2, -1),
-                                index[k], fileInfo);
+                            (s.charAt(0) === '@' ?
+                                new(tree.Variable)('@' + s.slice(2, -1), index[k], fileInfo) :
+                                new(tree.Property)('$' + s.slice(2, -1), index[k], fileInfo));
                     }
                     return name;
                 }
@@ -5273,7 +5606,7 @@ Parser.serializeVars = function(vars) {
 
 module.exports = Parser;
 
-},{"../less-error":34,"../tree":65,"../utils":86,"../visitors":90,"./parser-input":39}],41:[function(require,module,exports){
+},{"../functions/function-registry":26,"../less-error":36,"../tree":65,"../utils":86,"../visitors":90,"./parser-input":41}],43:[function(require,module,exports){
 /**
  * Plugin Manager
  */
@@ -5290,11 +5623,11 @@ var PluginManager = function(less) {
 };
 
 var pm, PluginManagerFactory = function(less, newFactory) {
-    if (newFactory || !pm) {
-        pm = new PluginManager(less);
-    }
-    return pm;
-};
+        if (newFactory || !pm) {
+            pm = new PluginManager(less);
+        }
+        return pm;
+    };
 
 /**
  * Adds all the plugins in the array
@@ -5312,13 +5645,13 @@ PluginManager.prototype.addPlugins = function(plugins) {
  * @param plugin
  * @param {String} filename
  */
-PluginManager.prototype.addPlugin = function(plugin, filename) {
+PluginManager.prototype.addPlugin = function(plugin, filename, functionRegistry) {
     this.installedPlugins.push(plugin);
     if (filename) {
         this.pluginCache[filename] = plugin;
     }
     if (plugin.install) {
-        plugin.install(this.less, this);
+        plugin.install(this.less, this, functionRegistry || this.less.functions.functionRegistry);
     }
 };
 /**
@@ -5329,37 +5662,12 @@ PluginManager.prototype.get = function(filename) {
     return this.pluginCache[filename];
 };
 
-// Object.getPrototypeOf shim for visitor upgrade
-if (!Object.getPrototypeOf) {
-    Object.getPrototypeOf = function getPrototypeOf(object) {
-        return object.constructor ? object.constructor.prototype : void 0;
-    };
-}
-
-function upgradeVisitors(visitor, oldType, newType) {
-
-    if (visitor['visit' + oldType] && !visitor['visit' + newType]) {
-        visitor['visit' + newType] = visitor['visit' + oldType];
-    }
-    if (visitor['visit' + oldType + 'Out'] && !visitor['visit' + newType + 'Out']) {
-        visitor['visit' + newType + 'Out'] = visitor['visit' + oldType + 'Out'];
-    }
-}
 /**
  * Adds a visitor. The visitor object has options on itself to determine
  * when it should run.
  * @param visitor
  */
 PluginManager.prototype.addVisitor = function(visitor) {
-    var proto;
-    // 2.x to 3.x visitor compatibility
-    try {
-        proto = Object.getPrototypeOf(visitor);
-        upgradeVisitors(proto, 'Directive', 'AtRule');
-        upgradeVisitors(proto, 'Rule', 'Declaration');
-    }
-    catch(e) {}
-
     this.visitors.push(visitor);
 };
 /**
@@ -5452,17 +5760,21 @@ PluginManager.prototype.getFileManagers = function() {
     return this.fileManagers;
 };
 
-// 
+//
 module.exports = PluginManagerFactory;
 
-},{}],42:[function(require,module,exports){
-var PromiseConstructor;
+},{}],44:[function(require,module,exports){
+var PromiseConstructor,
+    utils = require('./utils');
 
 module.exports = function(environment, ParseTree, ImportManager) {
     var render = function (input, options, callback) {
         if (typeof options === 'function') {
             callback = options;
-            options = {};
+            options = utils.defaults(this.options, {});
+        }
+        else {
+            options = utils.defaults(this.options, options || {});
         }
 
         if (!callback) {
@@ -5498,7 +5810,7 @@ module.exports = function(environment, ParseTree, ImportManager) {
     return render;
 };
 
-},{"promise":undefined}],43:[function(require,module,exports){
+},{"./utils":86,"promise":undefined}],45:[function(require,module,exports){
 module.exports = function (SourceMapOutput, environment) {
 
     var SourceMapBuilder = function (options) {
@@ -5527,6 +5839,9 @@ module.exports = function (SourceMapOutput, environment) {
         if (this.options.sourceMapInputFilename) {
             this.sourceMapInputFilename = sourceMapOutput.normalizeFilename(this.options.sourceMapInputFilename);
         }
+        if (this.options.sourceMapBasepath !== undefined && this.sourceMapURL !== undefined) {
+            this.sourceMapURL = sourceMapOutput.removeBasepath(this.sourceMapURL);
+        }
         return css + this.getCSSAppendage();
     };
 
@@ -5569,7 +5884,7 @@ module.exports = function (SourceMapOutput, environment) {
     return SourceMapBuilder;
 };
 
-},{}],44:[function(require,module,exports){
+},{}],46:[function(require,module,exports){
 module.exports = function (environment) {
 
     var SourceMapOutput = function (options) {
@@ -5600,21 +5915,26 @@ module.exports = function (environment) {
         this._column = 0;
     };
 
-    SourceMapOutput.prototype.normalizeFilename = function(filename) {
-        filename = filename.replace(/\\/g, '/');
-
-        if (this._sourceMapBasepath && filename.indexOf(this._sourceMapBasepath) === 0) {
-            filename = filename.substring(this._sourceMapBasepath.length);
-            if (filename.charAt(0) === '\\' || filename.charAt(0) === '/') {
-                filename = filename.substring(1);
+    SourceMapOutput.prototype.removeBasepath = function(path) {
+        if (this._sourceMapBasepath && path.indexOf(this._sourceMapBasepath) === 0) {
+            path = path.substring(this._sourceMapBasepath.length);
+            if (path.charAt(0) === '\\' || path.charAt(0) === '/') {
+                path = path.substring(1);
             }
         }
+
+        return path;
+    };
+
+    SourceMapOutput.prototype.normalizeFilename = function(filename) {
+        filename = filename.replace(/\\/g, '/');
+        filename = this.removeBasepath(filename);
         return (this._sourceMapRootpath || "") + filename;
     };
 
     SourceMapOutput.prototype.add = function(chunk, fileInfo, index, mapLines) {
 
-        //ignore adding empty strings
+        // ignore adding empty strings
         if (!chunk) {
             return;
         }
@@ -5709,7 +6029,7 @@ module.exports = function (environment) {
     return SourceMapOutput;
 };
 
-},{}],45:[function(require,module,exports){
+},{}],47:[function(require,module,exports){
 var contexts = require("./contexts"),
     visitor = require("./visitors"),
     tree = require("./tree");
@@ -5737,8 +6057,8 @@ module.exports = function(root, options) {
         variables = Object.keys(variables).map(function (k) {
             var value = variables[k];
 
-            if (! (value instanceof tree.Value)) {
-                if (! (value instanceof tree.Expression)) {
+            if (!(value instanceof tree.Value)) {
+                if (!(value instanceof tree.Expression)) {
                     value = new tree.Expression([value]);
                 }
                 value = new tree.Value([value]);
@@ -5784,37 +6104,7 @@ module.exports = function(root, options) {
     return evaldRoot;
 };
 
-},{"./contexts":12,"./tree":65,"./visitors":90}],46:[function(require,module,exports){
-var Node = require("./node");
-
-var Alpha = function (val) {
-    this.value = val;
-};
-Alpha.prototype = new Node();
-Alpha.prototype.type = "Alpha";
-
-Alpha.prototype.accept = function (visitor) {
-    this.value = visitor.visit(this.value);
-};
-Alpha.prototype.eval = function (context) {
-    if (this.value.eval) { return new Alpha(this.value.eval(context)); }
-    return this;
-};
-Alpha.prototype.genCSS = function (context, output) {
-    output.add("alpha(opacity=");
-
-    if (this.value.genCSS) {
-        this.value.genCSS(context, output);
-    } else {
-        output.add(this.value);
-    }
-
-    output.add(")");
-};
-
-module.exports = Alpha;
-
-},{"./node":73}],47:[function(require,module,exports){
+},{"./contexts":12,"./tree":65,"./visitors":90}],48:[function(require,module,exports){
 var Node = require("./node");
 
 var Anonymous = function (value, index, currentFileInfo, mapLines, rulesetLike, visibilityInfo) {
@@ -5838,11 +6128,14 @@ Anonymous.prototype.isRulesetLike = function() {
     return this.rulesetLike;
 };
 Anonymous.prototype.genCSS = function (context, output) {
-    output.add(this.value, this._fileInfo, this._index, this.mapLines);
+    this.nodeVisible = Boolean(this.value);
+    if (this.nodeVisible) {
+        output.add(this.value, this._fileInfo, this._index, this.mapLines);
+    }
 };
 module.exports = Anonymous;
 
-},{"./node":73}],48:[function(require,module,exports){
+},{"./node":73}],49:[function(require,module,exports){
 var Node = require("./node");
 
 var Assignment = function (key, val) {
@@ -5871,16 +6164,17 @@ Assignment.prototype.genCSS = function (context, output) {
 };
 module.exports = Assignment;
 
-},{"./node":73}],49:[function(require,module,exports){
+},{"./node":73}],50:[function(require,module,exports){
 var Node = require("./node"),
     Selector = require("./selector"),
-    Ruleset = require("./ruleset");
+    Ruleset = require("./ruleset"),
+    Anonymous = require('./anonymous');
 
 var AtRule = function (name, value, rules, index, currentFileInfo, debugInfo, isRooted, visibilityInfo) {
     var i;
 
     this.name  = name;
-    this.value = value;
+    this.value = (value instanceof Node) ? value : (value ? new Anonymous(value) : value);
     if (rules) {
         if (Array.isArray(rules)) {
             this.rules = rules;
@@ -5934,11 +6228,11 @@ AtRule.prototype.genCSS = function (context, output) {
 AtRule.prototype.eval = function (context) {
     var mediaPathBackup, mediaBlocksBackup, value = this.value, rules = this.rules;
 
-    //media stored inside other atrule should not bubble over it
-    //backpup media bubbling information
+    // media stored inside other atrule should not bubble over it
+    // backpup media bubbling information
     mediaPathBackup = context.mediaPath;
     mediaBlocksBackup = context.mediaBlocks;
-    //deleted media bubbling information
+    // deleted media bubbling information
     context.mediaPath = [];
     context.mediaBlocks = [];
 
@@ -5950,7 +6244,7 @@ AtRule.prototype.eval = function (context) {
         rules = [rules[0].eval(context)];
         rules[0].root = true;
     }
-    //restore media bubbling information
+    // restore media bubbling information
     context.mediaPath = mediaPathBackup;
     context.mediaBlocks = mediaBlocksBackup;
 
@@ -6008,7 +6302,7 @@ AtRule.prototype.outputRuleset = function (context, output, rules) {
 };
 module.exports = AtRule;
 
-},{"./node":73,"./ruleset":79,"./selector":80}],50:[function(require,module,exports){
+},{"./anonymous":48,"./node":73,"./ruleset":78,"./selector":79}],51:[function(require,module,exports){
 var Node = require("./node");
 
 var Attribute = function (key, op, value) {
@@ -6037,8 +6331,9 @@ Attribute.prototype.toCSS = function (context) {
 };
 module.exports = Attribute;
 
-},{"./node":73}],51:[function(require,module,exports){
+},{"./node":73}],52:[function(require,module,exports){
 var Node = require("./node"),
+    Anonymous = require("./anonymous"),
     FunctionCaller = require("../functions/function-caller");
 //
 // A function call node.
@@ -6046,6 +6341,7 @@ var Node = require("./node"),
 var Call = function (name, args, index, currentFileInfo) {
     this.name = name;
     this.args = args;
+    this.mathOn = name === 'calc' ? false : true;
     this._index = index;
     this._fileInfo = currentFileInfo;
 };
@@ -6068,8 +6364,16 @@ Call.prototype.accept = function (visitor) {
 // The function should receive the value, not the variable.
 //
 Call.prototype.eval = function (context) {
-    var args = this.args.map(function (a) { return a.eval(context); }),
-        result, funcCaller = new FunctionCaller(this.name, context, this.getIndex(), this.fileInfo());
+
+    /**
+     * Turn off math for calc(), and switch back on for evaluating nested functions
+     */
+    var currentMathContext = context.mathOn;
+    context.mathOn = this.mathOn;
+    var args = this.args.map(function (a) { return a.eval(context); });
+    context.mathOn = currentMathContext;
+
+    var result, funcCaller = new FunctionCaller(this.name, context, this.getIndex(), this.fileInfo());
     
     if (funcCaller.isValid()) {
         try {
@@ -6086,11 +6390,23 @@ Call.prototype.eval = function (context) {
             };
         }
 
-        if (result != null) {
+        if (result !== null && result !== undefined) {
+            // Results that that are not nodes are cast as Anonymous nodes
+            // Falsy values or booleans are returned as empty nodes
+            if (!(result instanceof Node)) {
+                if (!result || result === true) {
+                    result = new Anonymous(null); 
+                }
+                else {
+                    result = new Anonymous(result.toString()); 
+                }
+                
+            }
             result._index = this._index;
             result._fileInfo = this._fileInfo;
             return result;
         }
+
     }
 
     return new Call(this.name, args, this.getIndex(), this.fileInfo());
@@ -6109,7 +6425,7 @@ Call.prototype.genCSS = function (context, output) {
 };
 module.exports = Call;
 
-},{"../functions/function-caller":23,"./node":73}],52:[function(require,module,exports){
+},{"../functions/function-caller":25,"./anonymous":48,"./node":73}],53:[function(require,module,exports){
 var Node = require("./node"),
     colors = require("../data/colors");
 
@@ -6244,7 +6560,7 @@ Color.prototype.toHSL = function () {
     }
     return { h: h * 360, s: s, l: l, a: a };
 };
-//Adapted from http://mjijackson.com/2008/02/rgb-to-hsl-and-rgb-to-hsv-color-model-conversion-algorithms-in-javascript
+// Adapted from http://mjijackson.com/2008/02/rgb-to-hsl-and-rgb-to-hsv-color-model-conversion-algorithms-in-javascript
 Color.prototype.toHSV = function () {
     var r = this.rgb[0] / 255,
         g = this.rgb[1] / 255,
@@ -6264,7 +6580,7 @@ Color.prototype.toHSV = function () {
     if (max === min) {
         h = 0;
     } else {
-        switch(max) {
+        switch (max) {
             case r: h = (g - b) / d + (g < b ? 6 : 0); break;
             case g: h = (b - r) / d + 2; break;
             case b: h = (r - g) / d + 4; break;
@@ -6300,7 +6616,7 @@ Color.fromKeyword = function(keyword) {
 };
 module.exports = Color;
 
-},{"../data/colors":13,"./node":73}],53:[function(require,module,exports){
+},{"../data/colors":13,"./node":73}],54:[function(require,module,exports){
 var Node = require("./node");
 
 var Combinator = function (value) {
@@ -6325,7 +6641,7 @@ Combinator.prototype.genCSS = function (context, output) {
 };
 module.exports = Combinator;
 
-},{"./node":73}],54:[function(require,module,exports){
+},{"./node":73}],55:[function(require,module,exports){
 var Node = require("./node"),
     getDebugInfo = require("./debug-info");
 
@@ -6350,7 +6666,7 @@ Comment.prototype.isSilent = function(context) {
 };
 module.exports = Comment;
 
-},{"./debug-info":56,"./node":73}],55:[function(require,module,exports){
+},{"./debug-info":57,"./node":73}],56:[function(require,module,exports){
 var Node = require("./node");
 
 var Condition = function (op, l, r, i, negate) {
@@ -6389,11 +6705,11 @@ Condition.prototype.eval = function (context) {
 };
 module.exports = Condition;
 
-},{"./node":73}],56:[function(require,module,exports){
+},{"./node":73}],57:[function(require,module,exports){
 var debugInfo = function(context, ctx, lineSeparator) {
     var result = "";
     if (context.dumpLineNumbers && !context.compress) {
-        switch(context.dumpLineNumbers) {
+        switch (context.dumpLineNumbers) {
             case 'comments':
                 result = debugInfo.asComment(ctx);
                 break;
@@ -6429,14 +6745,15 @@ debugInfo.asMediaQuery = function(ctx) {
 
 module.exports = debugInfo;
 
-},{}],57:[function(require,module,exports){
+},{}],58:[function(require,module,exports){
 var Node = require("./node"),
     Value = require("./value"),
-    Keyword = require("./keyword");
+    Keyword = require("./keyword"),
+    Anonymous = require("./anonymous");
 
 var Declaration = function (name, value, important, merge, index, currentFileInfo, inline, variable) {
     this.name = name;
-    this.value = (value instanceof Node) ? value : new Value([value]); //value instanceof tree.Value || value instanceof tree.Ruleset ??
+    this.value = (value instanceof Node) ? value : new Value([value ? new Anonymous(value) : null]);
     this.important = important ? ' ' + important.trim() : '';
     this.merge = merge;
     this._index = index;
@@ -6464,7 +6781,7 @@ Declaration.prototype.genCSS = function (context, output) {
     try {
         this.value.genCSS(context, output);
     }
-    catch(e) {
+    catch (e) {
         e.index = this._index;
         e.filename = this._fileInfo.filename;
         throw e;
@@ -6490,7 +6807,7 @@ Declaration.prototype.eval = function (context) {
 
         if (!this.variable && evaldValue.type === "DetachedRuleset") {
             throw { message: "Rulesets cannot be evaluated on a property.",
-                    index: this.getIndex(), filename: this.fileInfo().filename };
+                index: this.getIndex(), filename: this.fileInfo().filename };
         }
         var important = this.important,
             importantResult = context.importantScope.pop();
@@ -6505,7 +6822,7 @@ Declaration.prototype.eval = function (context) {
                           this.getIndex(), this.fileInfo(), this.inline,
                               variable);
     }
-    catch(e) {
+    catch (e) {
         if (typeof e.index !== 'number') {
             e.index = this.getIndex();
             e.filename = this.fileInfo().filename;
@@ -6527,7 +6844,7 @@ Declaration.prototype.makeImportant = function () {
 };
 
 module.exports = Declaration;
-},{"./keyword":68,"./node":73,"./value":84}],58:[function(require,module,exports){
+},{"./anonymous":48,"./keyword":68,"./node":73,"./value":83}],59:[function(require,module,exports){
 var Node = require("./node"),
     contexts = require("../contexts"),
     utils = require("../utils");
@@ -6552,7 +6869,7 @@ DetachedRuleset.prototype.callEval = function (context) {
 };
 module.exports = DetachedRuleset;
 
-},{"../contexts":12,"../utils":86,"./node":73}],59:[function(require,module,exports){
+},{"../contexts":12,"../utils":86,"./node":73}],60:[function(require,module,exports){
 var Node = require("./node"),
     unitConversions = require("../data/unit-conversions"),
     Unit = require("./unit"),
@@ -6563,6 +6880,9 @@ var Node = require("./node"),
 //
 var Dimension = function (value, unit) {
     this.value = parseFloat(value);
+    if (isNaN(this.value)) {
+        throw new Error("Dimension is not a number.");
+    }
     this.unit = (unit && unit instanceof Unit) ? unit :
       new Unit(unit ? [unit] : undefined);
     this.setParent(this.unit, this);
@@ -6613,7 +6933,7 @@ Dimension.prototype.genCSS = function (context, output) {
 // we default to the first Dimension's unit,
 // so `1px + 2` will yield `3px`.
 Dimension.prototype.operate = function (context, op, other) {
-    /*jshint noempty:false */
+    /* jshint noempty:false */
     var value = this._operate(context, op, this.value, other.value),
         unit = this.unit.clone();
 
@@ -6712,20 +7032,7 @@ Dimension.prototype.convertTo = function (conversions) {
 };
 module.exports = Dimension;
 
-},{"../data/unit-conversions":15,"./color":52,"./node":73,"./unit":82}],60:[function(require,module,exports){
-// Backwards compatibility shim for Directive (AtRule)
-var AtRule = require("./atrule");
-
-var Directive = function () {
-    var args = Array.prototype.slice.call(arguments);
-    AtRule.apply(this, args);
-};
-
-Directive.prototype = Object.create(AtRule.prototype);
-Directive.prototype.constructor = Directive;
-
-module.exports = Directive;
-},{"./atrule":49}],61:[function(require,module,exports){
+},{"../data/unit-conversions":15,"./color":53,"./node":73,"./unit":81}],61:[function(require,module,exports){
 var Node = require("./node"),
     Paren = require("./paren"),
     Combinator = require("./combinator");
@@ -6788,7 +7095,7 @@ Element.prototype.toCSS = function (context) {
 };
 module.exports = Element;
 
-},{"./combinator":53,"./node":73,"./paren":75}],62:[function(require,module,exports){
+},{"./combinator":54,"./node":73,"./paren":75}],62:[function(require,module,exports){
 var Node = require("./node"),
     Paren = require("./paren"),
     Comment = require("./comment");
@@ -6846,7 +7153,7 @@ Expression.prototype.throwAwayComments = function () {
 };
 module.exports = Expression;
 
-},{"./comment":54,"./node":73,"./paren":75}],63:[function(require,module,exports){
+},{"./comment":55,"./node":73,"./paren":75}],63:[function(require,module,exports){
 var Node = require("./node"),
     Selector = require("./selector");
 
@@ -6860,7 +7167,7 @@ var Extend = function Extend(selector, option, index, currentFileInfo, visibilit
     this.copyVisibilityInfo(visibilityInfo);
     this.allowRoot = true;
 
-    switch(option) {
+    switch (option) {
         case "all":
             this.allowBefore = true;
             this.allowAfter = true;
@@ -6885,7 +7192,7 @@ Extend.prototype.eval = function (context) {
 Extend.prototype.clone = function (context) {
     return new Extend(this.selector, this.option, this.getIndex(), this.fileInfo(), this.visibilityInfo());
 };
-//it concatenates (joins) all selectors in selector array
+// it concatenates (joins) all selectors in selector array
 Extend.prototype.findSelfSelectors = function (selectors) {
     var selfElements = [],
         i,
@@ -6906,14 +7213,15 @@ Extend.prototype.findSelfSelectors = function (selectors) {
 };
 module.exports = Extend;
 
-},{"./node":73,"./selector":80}],64:[function(require,module,exports){
+},{"./node":73,"./selector":79}],64:[function(require,module,exports){
 var Node = require("./node"),
     Media = require("./media"),
     URL = require("./url"),
     Quoted = require("./quoted"),
     Ruleset = require("./ruleset"),
     Anonymous = require("./anonymous"),
-    utils = require("../utils");
+    utils = require("../utils"),
+    LessError = require("../less-error");
 
 //
 // CSS @import node
@@ -6939,7 +7247,7 @@ var Import = function (path, features, options, index, currentFileInfo, visibili
         this.css = !this.options.less || this.options.inline;
     } else {
         var pathValue = this.getPath();
-        if (pathValue && /[#\.\&\?\/]css([\?;].*)?$/.test(pathValue)) {
+        if (pathValue && /[#\.\&\?]css([\?;].*)?$/.test(pathValue)) {
             this.css = true;
         }
     }
@@ -7025,8 +7333,8 @@ Import.prototype.eval = function (context) {
     if (this.options.reference || this.blocksVisibility()) {
         if (result.length || result.length === 0) {
             result.forEach(function (node) {
-                    node.addVisibilityBlock();
-                }
+                node.addVisibilityBlock();
+            }
             );
         } else {
             result.addVisibilityBlock();
@@ -7040,12 +7348,19 @@ Import.prototype.doEval = function (context) {
 
     if (this.options.isPlugin) {
         if (this.root && this.root.eval) {
-            this.root.eval(context);
+            try {
+                this.root.eval(context);
+            }
+            catch (e) {
+                e.message = "Plugin error during evaluation";
+                throw new LessError(e, this.root.imports, this.root.filename);
+            }
         }
         registry = context.frames[0] && context.frames[0].functionRegistry;
         if ( registry && this.root && this.root.functions ) {
             registry.addMultiple( this.root.functions );
         }
+
         return [];
     }
 
@@ -7059,10 +7374,10 @@ Import.prototype.doEval = function (context) {
     }
     if (this.options.inline) {
         var contents = new Anonymous(this.root, 0,
-          {
-              filename: this.importedFilename,
-              reference: this.path._fileInfo && this.path._fileInfo.reference
-          }, true, true);
+            {
+                filename: this.importedFilename,
+                reference: this.path._fileInfo && this.path._fileInfo.reference
+            }, true, true);
 
         return this.features ? new Media([contents], this.features.value) : [contents];
     } else if (this.css) {
@@ -7080,21 +7395,19 @@ Import.prototype.doEval = function (context) {
 };
 module.exports = Import;
 
-},{"../utils":86,"./anonymous":47,"./media":69,"./node":73,"./quoted":76,"./ruleset":79,"./url":83}],65:[function(require,module,exports){
-var tree = {};
+},{"../less-error":36,"../utils":86,"./anonymous":48,"./media":69,"./node":73,"./quoted":77,"./ruleset":78,"./url":82}],65:[function(require,module,exports){
+var tree = Object.create(null);
 
 tree.Node = require('./node');
-tree.Alpha = require('./alpha');
 tree.Color = require('./color');
 tree.AtRule = require('./atrule');
-// Backwards compatibility
-tree.Directive = require('./directive');
 tree.DetachedRuleset = require('./detached-ruleset');
 tree.Operation = require('./operation');
 tree.Dimension = require('./dimension');
 tree.Unit = require('./unit');
 tree.Keyword = require('./keyword');
 tree.Variable = require('./variable');
+tree.Property = require('./property');
 tree.Ruleset = require('./ruleset');
 tree.Element = require('./element');
 tree.Attribute = require('./attribute');
@@ -7103,8 +7416,6 @@ tree.Selector = require('./selector');
 tree.Quoted = require('./quoted');
 tree.Expression = require('./expression');
 tree.Declaration = require('./declaration');
-// Backwards compatibility
-tree.Rule = require('./rule');
 tree.Call = require('./call');
 tree.URL = require('./url');
 tree.Import = require('./import');
@@ -7123,11 +7434,11 @@ tree.Media = require('./media');
 tree.UnicodeDescriptor = require('./unicode-descriptor');
 tree.Negative = require('./negative');
 tree.Extend = require('./extend');
-tree.RulesetCall = require('./ruleset-call');
+tree.VariableCall = require('./variable-call');
 
 module.exports = tree;
 
-},{"./alpha":46,"./anonymous":47,"./assignment":48,"./atrule":49,"./attribute":50,"./call":51,"./color":52,"./combinator":53,"./comment":54,"./condition":55,"./declaration":57,"./detached-ruleset":58,"./dimension":59,"./directive":60,"./element":61,"./expression":62,"./extend":63,"./import":64,"./javascript":66,"./keyword":68,"./media":69,"./mixin-call":70,"./mixin-definition":71,"./negative":72,"./node":73,"./operation":74,"./paren":75,"./quoted":76,"./rule":77,"./ruleset":79,"./ruleset-call":78,"./selector":80,"./unicode-descriptor":81,"./unit":82,"./url":83,"./value":84,"./variable":85}],66:[function(require,module,exports){
+},{"./anonymous":48,"./assignment":49,"./atrule":50,"./attribute":51,"./call":52,"./color":53,"./combinator":54,"./comment":55,"./condition":56,"./declaration":58,"./detached-ruleset":59,"./dimension":60,"./element":61,"./expression":62,"./extend":63,"./import":64,"./javascript":66,"./keyword":68,"./media":69,"./mixin-call":70,"./mixin-definition":71,"./negative":72,"./node":73,"./operation":74,"./paren":75,"./property":76,"./quoted":77,"./ruleset":78,"./selector":79,"./unicode-descriptor":80,"./unit":81,"./url":82,"./value":83,"./variable":85,"./variable-call":84}],66:[function(require,module,exports){
 var JsEvalNode = require("./js-eval-node"),
     Dimension = require("./dimension"),
     Quoted = require("./quoted"),
@@ -7157,7 +7468,7 @@ JavaScript.prototype.eval = function(context) {
 
 module.exports = JavaScript;
 
-},{"./anonymous":47,"./dimension":59,"./js-eval-node":67,"./quoted":76}],67:[function(require,module,exports){
+},{"./anonymous":48,"./dimension":60,"./js-eval-node":67,"./quoted":77}],67:[function(require,module,exports){
 var Node = require("./node"),
     Variable = require("./variable");
 
@@ -7191,7 +7502,7 @@ JsEvalNode.prototype.evaluateJavaScript = function (expression, context) {
     var variables = context.frames[0].variables();
     for (var k in variables) {
         if (variables.hasOwnProperty(k)) {
-            /*jshint loopfunc:true */
+            /* jshint loopfunc:true */
             evalContext[k.slice(1)] = {
                 value: variables[k].value,
                 toJS: function () {
@@ -7262,7 +7573,7 @@ var Media = function (value, features, index, currentFileInfo, visibilityInfo) {
 };
 Media.prototype = new AtRule();
 Media.prototype.type = "Media";
-Media.prototype.isRulesetLike = true;
+Media.prototype.isRulesetLike = function() { return true; };
 Media.prototype.accept = function (visitor) {
     if (this.features) {
         this.features = visitor.visit(this.features);
@@ -7287,19 +7598,8 @@ Media.prototype.eval = function (context) {
         this.rules[0].debugInfo = this.debugInfo;
         media.debugInfo = this.debugInfo;
     }
-    var strictMathBypass = false;
-    if (!context.strictMath) {
-        strictMathBypass = true;
-        context.strictMath = true;
-    }
-    try {
-        media.features = this.features.eval(context);
-    }
-    finally {
-        if (strictMathBypass) {
-            context.strictMath = false;
-        }
-    }
+    
+    media.features = this.features.eval(context);
 
     context.mediaPath.push(media);
     context.mediaBlocks.push(media);
@@ -7390,7 +7690,7 @@ Media.prototype.bubbleSelectors = function (selectors) {
 };
 module.exports = Media;
 
-},{"../utils":86,"./anonymous":47,"./atrule":49,"./expression":62,"./ruleset":79,"./selector":80,"./value":84}],70:[function(require,module,exports){
+},{"../utils":86,"./anonymous":48,"./atrule":50,"./expression":62,"./ruleset":78,"./selector":79,"./value":83}],70:[function(require,module,exports){
 var Node = require("./node"),
     Selector = require("./selector"),
     MixinDefinition = require("./mixin-definition"),
@@ -7576,7 +7876,7 @@ MixinCall.prototype.format = function (args) {
 };
 module.exports = MixinCall;
 
-},{"../functions/default":22,"./mixin-definition":71,"./node":73,"./selector":80}],71:[function(require,module,exports){
+},{"../functions/default":24,"./mixin-definition":71,"./node":73,"./selector":79}],71:[function(require,module,exports){
 var Selector = require("./selector"),
     Element = require("./element"),
     Ruleset = require("./ruleset"),
@@ -7622,7 +7922,7 @@ Definition.prototype.accept = function (visitor) {
     }
 };
 Definition.prototype.evalParams = function (context, mixinEnv, args, evaldArguments) {
-    /*jshint boss:true */
+    /* jshint boss:true */
     var frame = new Ruleset(null, null),
         varargs, arg,
         params = utils.copyArray(this.params),
@@ -7735,7 +8035,7 @@ Definition.prototype.evalCall = function (context, args, important) {
 Definition.prototype.matchCondition = function (args, context) {
     if (this.condition && !this.condition.eval(
         new contexts.Eval(context,
-            [this.evalParams(context, /* the parameter variables*/
+            [this.evalParams(context, /* the parameter variables */
                 new contexts.Eval(context, this.frames ? this.frames.concat(context.frames) : context.frames), args, [])]
             .concat(this.frames || []) // the parent namespace/mixin frames
             .concat(context.frames)))) { // the current environment frames
@@ -7753,7 +8053,7 @@ Definition.prototype.matchArgs = function (args, context) {
         }
     }, 0);
 
-    if (! this.variadic) {
+    if (!this.variadic) {
         if (requiredArgsCnt < this.required) {
             return false;
         }
@@ -7780,7 +8080,7 @@ Definition.prototype.matchArgs = function (args, context) {
 };
 module.exports = Definition;
 
-},{"../contexts":12,"../utils":86,"./declaration":57,"./element":61,"./expression":62,"./ruleset":79,"./selector":80}],72:[function(require,module,exports){
+},{"../contexts":12,"../utils":86,"./declaration":58,"./element":61,"./expression":62,"./ruleset":78,"./selector":79}],72:[function(require,module,exports){
 var Node = require("./node"),
     Operation = require("./operation"),
     Dimension = require("./dimension");
@@ -7802,11 +8102,13 @@ Negative.prototype.eval = function (context) {
 };
 module.exports = Negative;
 
-},{"./dimension":59,"./node":73,"./operation":74}],73:[function(require,module,exports){
+},{"./dimension":60,"./node":73,"./operation":74}],73:[function(require,module,exports){
 var Node = function() {
     this.parent = null;
     this.visibilityBlocks = undefined;
     this.nodeVisible = undefined;
+    this.rootNode = null;
+    this.parsed = null;
 
     var self = this;
     Object.defineProperty(this, "currentFileInfo", {
@@ -7836,6 +8138,7 @@ Node.prototype.getIndex = function() {
 Node.prototype.fileInfo = function() {
     return this._fileInfo || (this.parent && this.parent.fileInfo()) || {};
 };
+Node.prototype.isRulesetLike = function() { return false; };
 Node.prototype.toCSS = function (context) {
     var strs = [];
     this.genCSS(context, {
@@ -7865,8 +8168,8 @@ Node.prototype._operate = function (context, op, a, b) {
 };
 Node.prototype.fround = function(context, value) {
     var precision = context && context.numPrecision;
-    //add "epsilon" to ensure numbers like 1.000000005 (represented as 1.000000004999....) are properly rounded...
-    return (precision == null) ? value : Number((value + 2e-16).toFixed(precision));
+    // add "epsilon" to ensure numbers like 1.000000005 (represented as 1.000000004999...) are properly rounded:
+    return (precision) ? Number((value + 2e-16).toFixed(precision)) : value;
 };
 Node.compare = function (a, b) {
     /* returns:
@@ -7926,13 +8229,13 @@ Node.prototype.removeVisibilityBlock = function () {
     }
     this.visibilityBlocks = this.visibilityBlocks - 1;
 };
-//Turns on node visibility - if called node will be shown in output regardless
-//of whether it comes from import by reference or not
+// Turns on node visibility - if called node will be shown in output regardless
+// of whether it comes from import by reference or not
 Node.prototype.ensureVisibility = function () {
     this.nodeVisible = true;
 };
-//Turns off node visibility - if called node will NOT be shown in output regardless
-//of whether it comes from import by reference or not
+// Turns off node visibility - if called node will NOT be shown in output regardless
+// of whether it comes from import by reference or not
 Node.prototype.ensureInvisibility = function () {
     this.nodeVisible = false;
 };
@@ -7986,7 +8289,7 @@ Operation.prototype.eval = function (context) {
         }
         if (!a.operate) {
             throw { type: "Operation",
-                    message: "Operation on an invalid type" };
+                message: "Operation on an invalid type" };
         }
 
         return a.operate(context, this.op, b);
@@ -8008,7 +8311,7 @@ Operation.prototype.genCSS = function (context, output) {
 
 module.exports = Operation;
 
-},{"./color":52,"./dimension":59,"./node":73}],75:[function(require,module,exports){
+},{"./color":53,"./dimension":60,"./node":73}],75:[function(require,module,exports){
 var Node = require("./node");
 
 var Paren = function (node) {
@@ -8028,8 +8331,80 @@ module.exports = Paren;
 
 },{"./node":73}],76:[function(require,module,exports){
 var Node = require("./node"),
-    JsEvalNode = require("./js-eval-node"),
-    Variable = require("./variable");
+    Declaration = require("./declaration");
+
+var Property = function (name, index, currentFileInfo) {
+    this.name = name;
+    this._index = index;
+    this._fileInfo = currentFileInfo;
+};
+Property.prototype = new Node();
+Property.prototype.type = "Property";
+Property.prototype.eval = function (context) {
+    var property, name = this.name;
+    // TODO: shorten this reference
+    var mergeRules = context.pluginManager.less.visitors.ToCSSVisitor.prototype._mergeRules;
+
+    if (this.evaluating) {
+        throw { type: 'Name',
+            message: "Recursive property reference for " + name,
+            filename: this.fileInfo().filename,
+            index: this.getIndex() };
+    }
+
+    this.evaluating = true;
+
+    property = this.find(context.frames, function (frame) {
+
+        var v, vArr = frame.property(name);
+        if (vArr) {
+            for (var i = 0; i < vArr.length; i++) {
+                v = vArr[i];
+
+                vArr[i] = new Declaration(v.name,
+                    v.value,
+                    v.important,
+                    v.merge,
+                    v.index,
+                    v.currentFileInfo,
+                    v.inline,
+                    v.variable
+                );
+            }
+            mergeRules(vArr);
+
+            v = vArr[vArr.length - 1];
+            if (v.important) {
+                var importantScope = context.importantScope[context.importantScope.length - 1];
+                importantScope.important = v.important;
+            }
+            v = v.value.eval(context);
+            return v;
+        }
+    });
+    if (property) {
+        this.evaluating = false;
+        return property;
+    } else {
+        throw { type: 'Name',
+            message: "Property '" + name + "' is undefined",
+            filename: this.currentFileInfo.filename,
+            index: this.index };
+    }
+};
+Property.prototype.find = function (obj, fun) {
+    for (var i = 0, r; i < obj.length; i++) {
+        r = fun.call(obj, obj[i]);
+        if (r) { return r; }
+    }
+    return null;
+};
+module.exports = Property;
+
+},{"./declaration":58,"./node":73}],77:[function(require,module,exports){
+var Node = require("./node"),
+    Variable = require("./variable"),
+    Property = require("./property");
 
 var Quoted = function (str, content, escaped, index, currentFileInfo) {
     this.escaped = (escaped == null) ? true : escaped;
@@ -8038,7 +8413,7 @@ var Quoted = function (str, content, escaped, index, currentFileInfo) {
     this._index = index;
     this._fileInfo = currentFileInfo;
 };
-Quoted.prototype = new JsEvalNode();
+Quoted.prototype = new Node();
 Quoted.prototype.type = "Quoted";
 Quoted.prototype.genCSS = function (context, output) {
     if (!this.escaped) {
@@ -8050,17 +8425,18 @@ Quoted.prototype.genCSS = function (context, output) {
     }
 };
 Quoted.prototype.containsVariables = function() {
-    return this.value.match(/(`([^`]+)`)|@\{([\w-]+)\}/);
+    return this.value.match(/@\{([\w-]+)\}/);
 };
 Quoted.prototype.eval = function (context) {
     var that = this, value = this.value;
-    var javascriptReplacement = function (_, exp) {
-        return String(that.evaluateJavaScript(exp, context));
-    };
-    var interpolationReplacement = function (_, name) {
+    var variableReplacement = function (_, name) {
         var v = new Variable('@' + name, that.getIndex(), that.fileInfo()).eval(context, true);
         return (v instanceof Quoted) ? v.value : v.toCSS();
     };
+    var propertyReplacement = function (_, name) {
+        var v = new Property('$' + name, that.getIndex(), that.fileInfo()).eval(context, true);
+        return (v instanceof Quoted) ? v.value : v.toCSS();
+    };
     function iterativeReplace(value, regexp, replacementFnc) {
         var evaluatedValue = value;
         do {
@@ -8069,8 +8445,8 @@ Quoted.prototype.eval = function (context) {
         } while (value !== evaluatedValue);
         return evaluatedValue;
     }
-    value = iterativeReplace(value, /`([^`]+)`/g, javascriptReplacement);
-    value = iterativeReplace(value, /@\{([\w-]+)\}/g, interpolationReplacement);
+    value = iterativeReplace(value, /@\{([\w-]+)\}/g, variableReplacement);
+    value = iterativeReplace(value, /\$\{([\w-]+)\}/g, propertyReplacement);
     return new Quoted(this.quote + value + this.quote, value, this.escaped, this.getIndex(), this.fileInfo());
 };
 Quoted.prototype.compare = function (other) {
@@ -8083,41 +8459,15 @@ Quoted.prototype.compare = function (other) {
 };
 module.exports = Quoted;
 
-},{"./js-eval-node":67,"./node":73,"./variable":85}],77:[function(require,module,exports){
-// Backwards compatibility shim for Rule (Declaration)
-var Declaration = require("./declaration");
-
-var Rule = function () {
-    var args = Array.prototype.slice.call(arguments);
-    Declaration.apply(this, args);
-};
-
-Rule.prototype = Object.create(Declaration.prototype);
-Rule.prototype.constructor = Rule;
-
-module.exports = Rule;
-},{"./declaration":57}],78:[function(require,module,exports){
-var Node = require("./node"),
-    Variable = require("./variable");
-
-var RulesetCall = function (variable) {
-    this.variable = variable;
-    this.allowRoot = true;
-};
-RulesetCall.prototype = new Node();
-RulesetCall.prototype.type = "RulesetCall";
-RulesetCall.prototype.eval = function (context) {
-    var detachedRuleset = new Variable(this.variable).eval(context);
-    return detachedRuleset.callEval(context);
-};
-module.exports = RulesetCall;
-
-},{"./node":73,"./variable":85}],79:[function(require,module,exports){
+},{"./node":73,"./property":76,"./variable":85}],78:[function(require,module,exports){
 var Node = require("./node"),
     Declaration = require("./declaration"),
+    Keyword = require("./keyword"),
+    Comment = require("./comment"),
+    Paren = require("./paren"),
     Selector = require("./selector"),
     Element = require("./element"),
-    Paren = require("./paren"),
+    Anonymous = require("./anonymous"),
     contexts = require("../contexts"),
     globalFunctionRegistry = require("../functions/function-registry"),
     defaultFunc = require("../functions/default"),
@@ -8128,9 +8478,12 @@ var Ruleset = function (selectors, rules, strictImports, visibilityInfo) {
     this.selectors = selectors;
     this.rules = rules;
     this._lookups = {};
+    this._variables = null;
+    this._properties = null;
     this.strictImports = strictImports;
     this.copyVisibilityInfo(visibilityInfo);
     this.allowRoot = true;
+
     this.setParent(this.selectors, this);
     this.setParent(this.rules, this);
 
@@ -8138,7 +8491,7 @@ var Ruleset = function (selectors, rules, strictImports, visibilityInfo) {
 Ruleset.prototype = new Node();
 Ruleset.prototype.type = "Ruleset";
 Ruleset.prototype.isRuleset = true;
-Ruleset.prototype.isRulesetLike = true;
+Ruleset.prototype.isRulesetLike = function() { return true; };
 Ruleset.prototype.accept = function (visitor) {
     if (this.paths) {
         this.paths = visitor.visitArray(this.paths, true);
@@ -8219,20 +8572,20 @@ Ruleset.prototype.eval = function (context) {
 
     // Store the frames around mixin definitions,
     // so they can be evaluated like closures when the time comes.
-    var rsRules = ruleset.rules, rsRuleCnt = rsRules ? rsRules.length : 0;
-    for (i = 0; i < rsRuleCnt; i++) {
-        if (rsRules[i].evalFirst) {
-            rsRules[i] = rsRules[i].eval(context);
+    var rsRules = ruleset.rules;
+    for (i = 0; (rule = rsRules[i]); i++) {
+        if (rule.evalFirst) {
+            rsRules[i] = rule.eval(context);
         }
     }
 
     var mediaBlockCount = (context.mediaBlocks && context.mediaBlocks.length) || 0;
 
     // Evaluate mixin calls.
-    for (i = 0; i < rsRuleCnt; i++) {
-        if (rsRules[i].type === "MixinCall") {
-            /*jshint loopfunc:true */
-            rules = rsRules[i].eval(context).filter(function(r) {
+    for (i = 0; (rule = rsRules[i]); i++) {
+        if (rule.type === "MixinCall") {
+            /* jshint loopfunc:true */
+            rules = rule.eval(context).filter(function(r) {
                 if ((r instanceof Declaration) && r.variable) {
                     // do not pollute the scope if the variable is
                     // already there. consider returning false here
@@ -8242,12 +8595,11 @@ Ruleset.prototype.eval = function (context) {
                 return true;
             });
             rsRules.splice.apply(rsRules, [i, 1].concat(rules));
-            rsRuleCnt += rules.length - 1;
             i += rules.length - 1;
             ruleset.resetCache();
-        } else if (rsRules[i].type === "RulesetCall") {
-            /*jshint loopfunc:true */
-            rules = rsRules[i].eval(context).rules.filter(function(r) {
+        } else if (rule.type ===  "VariableCall") {
+            /* jshint loopfunc:true */
+            rules = rule.eval(context).rules.filter(function(r) {
                 if ((r instanceof Declaration) && r.variable) {
                     // do not pollute the scope at all
                     return false;
@@ -8255,31 +8607,27 @@ Ruleset.prototype.eval = function (context) {
                 return true;
             });
             rsRules.splice.apply(rsRules, [i, 1].concat(rules));
-            rsRuleCnt += rules.length - 1;
             i += rules.length - 1;
             ruleset.resetCache();
         }
     }
 
     // Evaluate everything else
-    for (i = 0; i < rsRules.length; i++) {
-        rule = rsRules[i];
+    for (i = 0; (rule = rsRules[i]); i++) {
         if (!rule.evalFirst) {
             rsRules[i] = rule = rule.eval ? rule.eval(context) : rule;
         }
     }
 
     // Evaluate everything else
-    for (i = 0; i < rsRules.length; i++) {
-        rule = rsRules[i];
+    for (i = 0; (rule = rsRules[i]); i++) {
         // for rulesets, check if it is a css guard and can be removed
         if (rule instanceof Ruleset && rule.selectors && rule.selectors.length === 1) {
             // check if it can be folded in (e.g. & where)
             if (rule.selectors[0].isJustParentSelector()) {
                 rsRules.splice(i--, 1);
 
-                for (var j = 0; j < rule.rules.length; j++) {
-                    subRule = rule.rules[j];
+                for (var j = 0; (subRule = rule.rules[j]); j++) {
                     if (subRule instanceof Node) {
                         subRule.copyVisibilityInfo(rule.visibilityInfo());
                         if (!(subRule instanceof Declaration) || !subRule.variable) {
@@ -8312,7 +8660,7 @@ Ruleset.prototype.evalImports = function(context) {
             importRules = rules[i].eval(context);
             if (importRules && (importRules.length || importRules.length === 0)) {
                 rules.splice.apply(rules, [i, 1].concat(importRules));
-                i+= importRules.length - 1;
+                i += importRules.length - 1;
             } else {
                 rules.splice(i, 1, importRules);
             }
@@ -8351,6 +8699,7 @@ Ruleset.prototype.matchCondition = function (args, context) {
 Ruleset.prototype.resetCache = function () {
     this._rulesets = null;
     this._variables = null;
+    this._properties = null;
     this._lookups = {};
 };
 Ruleset.prototype.variables = function () {
@@ -8375,17 +8724,81 @@ Ruleset.prototype.variables = function () {
     }
     return this._variables;
 };
+Ruleset.prototype.properties = function () {
+    if (!this._properties) {
+        this._properties = !this.rules ? {} : this.rules.reduce(function (hash, r) {
+            if (r instanceof Declaration && r.variable !== true) {
+                var name = (r.name.length === 1) && (r.name[0] instanceof Keyword) ?
+                    r.name[0].value : r.name;
+                // Properties don't overwrite as they can merge
+                if (!hash['$' + name]) {
+                    hash['$' + name] = [ r ];
+                }
+                else {
+                    hash['$' + name].push(r);
+                }
+            }
+            return hash;
+        }, {});
+    }
+    return this._properties;
+};
 Ruleset.prototype.variable = function (name) {
-    return this.variables()[name];
+    var decl = this.variables()[name];
+    if (decl) {
+        return this.parseValue(decl);
+    }
+};
+Ruleset.prototype.property = function (name) {
+    var decl = this.properties()[name];
+    if (decl) {
+        return this.parseValue(decl);
+    }
+};
+Ruleset.prototype.parseValue = function(toParse) {
+    var self = this;
+    function transformDeclaration(decl) {
+        if (decl.value instanceof Anonymous && !decl.parsed) {
+            this.parse.parseNode(
+                decl.value.value, 
+                ["value", "important"], 
+                decl.value.getIndex(), 
+                decl.fileInfo(), 
+                function(err, result) {
+                    if (err) {
+                        decl.parsed = true;
+                    }
+                    if (result) {
+                        decl.value = result[0];
+                        decl.important = result[1] || '';
+                        decl.parsed = true;
+                    }
+                });
+
+            return decl;
+        }
+        else {
+            return decl;
+        }
+    }
+    if (!Array.isArray(toParse)) {
+        return transformDeclaration.call(self, toParse);
+    }
+    else {
+        var nodes = [];
+        toParse.forEach(function(n) {
+            nodes.push(transformDeclaration.call(self, n));
+        });
+        return nodes;
+    }
 };
 Ruleset.prototype.rulesets = function () {
     if (!this.rules) { return []; }
 
-    var filtRules = [], rules = this.rules, cnt = rules.length,
+    var filtRules = [], rules = this.rules,
         i, rule;
 
-    for (i = 0; i < cnt; i++) {
-        rule = rules[i];
+    for (i = 0; (rule = rules[i]); i++) {
         if (rule.isRuleset) {
             filtRules.push(rule);
         }
@@ -8451,41 +8864,23 @@ Ruleset.prototype.genCSS = function (context, output) {
         tabSetStr = context.compress ? '' : Array(context.tabLevel).join("  "),
         sep;
 
-    function isRulesetLikeNode(rule) {
-        // if it has nested rules, then it should be treated like a ruleset
-        // medias and comments do not have nested rules, but should be treated like rulesets anyway
-        // some atrules and anonymous nodes are ruleset like, others are not
-        if (typeof rule.isRulesetLike === "boolean") {
-            return rule.isRulesetLike;
-        } else if (typeof rule.isRulesetLike === "function") {
-            return rule.isRulesetLike();
-        }
-
-        //anything else is assumed to be a rule
-        return false;
-    }
-
     var charsetNodeIndex = 0;
     var importNodeIndex = 0;
-    for (i = 0; i < this.rules.length; i++) {
-        rule = this.rules[i];
-        // Plugins may return something other than Nodes
-        if (rule instanceof Node) {
-            if (rule.type === "Comment") {
-                if (importNodeIndex === i) {
-                    importNodeIndex++;
-                }
-                ruleNodes.push(rule);
-            } else if (rule.isCharset && rule.isCharset()) {
-                ruleNodes.splice(charsetNodeIndex, 0, rule);
-                charsetNodeIndex++;
+    for (i = 0; (rule = this.rules[i]); i++) {
+        if (rule instanceof Comment) {
+            if (importNodeIndex === i) {
                 importNodeIndex++;
-            } else if (rule.type === "Import") {
-                ruleNodes.splice(importNodeIndex, 0, rule);
-                importNodeIndex++;
-            } else {
-                ruleNodes.push(rule);
             }
+            ruleNodes.push(rule);
+        } else if (rule.isCharset && rule.isCharset()) {
+            ruleNodes.splice(charsetNodeIndex, 0, rule);
+            charsetNodeIndex++;
+            importNodeIndex++;
+        } else if (rule.type === "Import") {
+            ruleNodes.splice(importNodeIndex, 0, rule);
+            importNodeIndex++;
+        } else {
+            ruleNodes.push(rule);
         }
     }
     ruleNodes = charsetRuleNodes.concat(ruleNodes);
@@ -8523,15 +8918,14 @@ Ruleset.prototype.genCSS = function (context, output) {
     }
 
     // Compile rules and rulesets
-    for (i = 0; i < ruleNodes.length; i++) {
-        rule = ruleNodes[i];
+    for (i = 0; (rule = ruleNodes[i]); i++) {
 
         if (i + 1 === ruleNodes.length) {
             context.lastRule = true;
         }
 
         var currentLastRule = context.lastRule;
-        if (isRulesetLikeNode(rule)) {
+        if (rule.isRulesetLike(rule)) {
             context.lastRule = false;
         }
 
@@ -8543,7 +8937,7 @@ Ruleset.prototype.genCSS = function (context, output) {
 
         context.lastRule = currentLastRule;
 
-        if (!context.lastRule) {
+        if (!context.lastRule && rule.isVisible()) {
             output.add(context.compress ? '' : ('\n' + tabRuleStr));
         } else {
             context.lastRule = false;
@@ -8597,7 +8991,7 @@ Ruleset.prototype.joinSelector = function (paths, context, selector) {
         // our new selector path
         newSelectorPath = [];
 
-        //construct the joined selector - if & is the first thing this will be empty,
+        // construct the joined selector - if & is the first thing this will be empty,
         // if not newJoinedSelector will be the last set of elements in the selector
         if (beginningPath.length > 0) {
             newSelectorPath = utils.copyArray(beginningPath);
@@ -8627,7 +9021,7 @@ Ruleset.prototype.joinSelector = function (paths, context, selector) {
             newSelectorPath.push(newJoinedSelector);
         }
 
-        //put together the parent selectors after the join (e.g. the rest of the parent)
+        // put together the parent selectors after the join (e.g. the rest of the parent)
         if (addPath.length > 1) {
             var restOfPath = addPath.slice(1);
             restOfPath = restOfPath.map(function (selector) {
@@ -8661,9 +9055,7 @@ Ruleset.prototype.joinSelector = function (paths, context, selector) {
             return;
         }
 
-        for (i = 0; i < selectors.length; i++) {
-            sel = selectors[i];
-
+        for (i = 0; (sel = selectors[i]); i++) {
             // if the previous thing in sel is a parent this needs to join on to it
             if (sel.length > 0) {
                 sel[sel.length - 1] = sel[sel.length - 1].createDerived(sel[sel.length - 1].elements.concat(elements));
@@ -8691,12 +9083,12 @@ Ruleset.prototype.joinSelector = function (paths, context, selector) {
         var i, j, k, currentElements, newSelectors, selectorsMultiplied, sel, el, hadParentSelector = false, length, lastSelector;
         function findNestedSelector(element) {
             var maybeSelector;
-            if (element.value.type !== 'Paren') {
+            if (!(element.value instanceof Paren)) {
                 return null;
             }
 
             maybeSelector = element.value.value;
-            if (maybeSelector.type !== 'Selector') {
+            if (!(maybeSelector instanceof Selector)) {
                 return null;
             }
 
@@ -8712,8 +9104,7 @@ Ruleset.prototype.joinSelector = function (paths, context, selector) {
             []
         ];
 
-        for (i = 0; i < inSelector.elements.length; i++) {
-            el = inSelector.elements[i];
+        for (i = 0; (el = inSelector.elements[i]); i++) {
             // non parent reference elements just get added
             if (el.value !== "&") {
                 var nestedSelector = findNestedSelector(el);
@@ -8725,7 +9116,7 @@ Ruleset.prototype.joinSelector = function (paths, context, selector) {
                     var nestedPaths = [], replaced, replacedNewSelectors = [];
                     replaced = replaceParentSelector(nestedPaths, context, nestedSelector);
                     hadParentSelector = hadParentSelector || replaced;
-                    //the nestedPaths array should have only one member - replaceParentSelector does not multiply selectors
+                    // the nestedPaths array should have only one member - replaceParentSelector does not multiply selectors
                     for (k = 0; k < nestedPaths.length; k++) {
                         var replacementSelector = createSelector(createParenthesis(nestedPaths[k], el), el);
                         addAllReplacementsIntoPath(newSelectors, [replacementSelector], el, inSelector, replacedNewSelectors);
@@ -8828,19 +9219,19 @@ Ruleset.prototype.joinSelector = function (paths, context, selector) {
 };
 module.exports = Ruleset;
 
-},{"../contexts":12,"../functions/default":22,"../functions/function-registry":24,"../utils":86,"./debug-info":56,"./declaration":57,"./element":61,"./node":73,"./paren":75,"./selector":80}],80:[function(require,module,exports){
+},{"../contexts":12,"../functions/default":24,"../functions/function-registry":26,"../utils":86,"./anonymous":48,"./comment":55,"./debug-info":57,"./declaration":58,"./element":61,"./keyword":68,"./node":73,"./paren":75,"./selector":79}],79:[function(require,module,exports){
 var Node = require("./node"),
-    Element = require("./element");
+    Element = require("./element"),
+    LessError = require("../less-error");
 
 var Selector = function (elements, extendList, condition, index, currentFileInfo, visibilityInfo) {
-    this.elements = elements;
     this.extendList = extendList;
     this.condition = condition;
+    this.evaldCondition = !condition;
     this._index = index;
     this._fileInfo = currentFileInfo;
-    if (!condition) {
-        this.evaldCondition = true;
-    }
+    this.elements = this.getElements(elements);
+    this.mixinElements_ = undefined;
     this.copyVisibilityInfo(visibilityInfo);
     this.setParent(this.elements, this);
 };
@@ -8858,13 +9249,32 @@ Selector.prototype.accept = function (visitor) {
     }
 };
 Selector.prototype.createDerived = function(elements, extendList, evaldCondition) {
-    var info = this.visibilityInfo();
-    evaldCondition = (evaldCondition != null) ? evaldCondition : this.evaldCondition;
-    var newSelector = new Selector(elements, extendList || this.extendList, null, this.getIndex(), this.fileInfo(), info);
-    newSelector.evaldCondition = evaldCondition;
+    elements = this.getElements(elements);
+    var newSelector = new Selector(elements, extendList || this.extendList,
+        null, this.getIndex(), this.fileInfo(), this.visibilityInfo());
+    newSelector.evaldCondition = (evaldCondition != null) ? evaldCondition : this.evaldCondition;
     newSelector.mediaEmpty = this.mediaEmpty;
     return newSelector;
 };
+Selector.prototype.getElements = function(els) {
+    if (typeof els === "string") {
+        this.parse.parseNode(
+            els, 
+            ["selector"],
+            this._index, 
+            this._fileInfo, 
+            function(err, result) {
+                if (err) {
+                    throw new LessError({
+                        index: err.index,
+                        message: err.message
+                    }, this.parse.imports, this._fileInfo.filename);
+                }
+                els = result[0].elements;
+            });
+    }
+    return els;
+};
 Selector.prototype.createEmptySelectors = function() {
     var el = new Element('', '&', this._index, this._fileInfo),
         sels = [new Selector([el], null, null, this._index, this._fileInfo)];
@@ -8876,14 +9286,13 @@ Selector.prototype.match = function (other) {
         len = elements.length,
         olen, i;
 
-    other.CacheElements();
-
-    olen = other._elements.length;
+    other = other.mixinElements();
+    olen = other.length;
     if (olen === 0 || len < olen) {
         return 0;
     } else {
         for (i = 0; i < olen; i++) {
-            if (elements[i].value !== other._elements[i]) {
+            if (elements[i].value !== other[i]) {
                 return 0;
             }
         }
@@ -8891,9 +9300,9 @@ Selector.prototype.match = function (other) {
 
     return olen; // return number of matched elements
 };
-Selector.prototype.CacheElements = function() {
-    if (this._elements) {
-        return;
+Selector.prototype.mixinElements = function() {
+    if (this.mixinElements_) {
+        return this.mixinElements_;
     }
 
     var elements = this.elements.map( function(v) {
@@ -8908,7 +9317,7 @@ Selector.prototype.CacheElements = function() {
         elements = [];
     }
 
-    this._elements = elements;
+    return (this.mixinElements_ = elements);
 };
 Selector.prototype.isJustParentSelector = function() {
     return !this.mediaEmpty &&
@@ -8930,12 +9339,9 @@ Selector.prototype.genCSS = function (context, output) {
     if ((!context || !context.firstSelector) && this.elements[0].combinator.value === "") {
         output.add(' ', this.fileInfo(), this.getIndex());
     }
-    if (!this._css) {
-        //TODO caching? speed comparison?
-        for (i = 0; i < this.elements.length; i++) {
-            element = this.elements[i];
-            element.genCSS(context, output);
-        }
+    for (i = 0; i < this.elements.length; i++) {
+        element = this.elements[i];
+        element.genCSS(context, output);
     }
 };
 Selector.prototype.getIsOutput = function() {
@@ -8943,7 +9349,7 @@ Selector.prototype.getIsOutput = function() {
 };
 module.exports = Selector;
 
-},{"./element":61,"./node":73}],81:[function(require,module,exports){
+},{"../less-error":36,"./element":61,"./node":73}],80:[function(require,module,exports){
 var Node = require("./node");
 
 var UnicodeDescriptor = function (value) {
@@ -8954,7 +9360,7 @@ UnicodeDescriptor.prototype.type = "UnicodeDescriptor";
 
 module.exports = UnicodeDescriptor;
 
-},{"./node":73}],82:[function(require,module,exports){
+},{"./node":73}],81:[function(require,module,exports){
 var Node = require("./node"),
     unitConversions = require("../data/unit-conversions"),
     utils = require("../utils");
@@ -9022,7 +9428,7 @@ Unit.prototype.usedUnits = function() {
     var group, result = {}, mapUnit, groupName;
 
     mapUnit = function (atomicUnit) {
-        /*jshint loopfunc:true */
+        /* jshint loopfunc:true */
         if (group.hasOwnProperty(atomicUnit) && !result[groupName]) {
             result[groupName] = atomicUnit;
         }
@@ -9077,7 +9483,7 @@ Unit.prototype.cancel = function () {
 };
 module.exports = Unit;
 
-},{"../data/unit-conversions":15,"../utils":86,"./node":73}],83:[function(require,module,exports){
+},{"../data/unit-conversions":15,"../utils":86,"./node":73}],82:[function(require,module,exports){
 var Node = require("./node");
 
 var URL = function (val, index, currentFileInfo, isEvald) {
@@ -9133,14 +9539,19 @@ URL.prototype.eval = function (context) {
 };
 module.exports = URL;
 
-},{"./node":73}],84:[function(require,module,exports){
+},{"./node":73}],83:[function(require,module,exports){
 var Node = require("./node");
 
 var Value = function (value) {
-    this.value = value;
     if (!value) {
         throw new Error("Value requires an array argument");
     }
+    if (!Array.isArray(value)) {
+        this.value = [ value ];
+    }
+    else {
+        this.value = value;
+    }
 };
 Value.prototype = new Node();
 Value.prototype.type = "Value";
@@ -9169,7 +9580,23 @@ Value.prototype.genCSS = function (context, output) {
 };
 module.exports = Value;
 
-},{"./node":73}],85:[function(require,module,exports){
+},{"./node":73}],84:[function(require,module,exports){
+var Node = require("./node"),
+    Variable = require("./variable");
+
+var VariableCall = function (variable) {
+    this.variable = variable;
+    this.allowRoot = true;
+};
+VariableCall.prototype = new Node();
+VariableCall.prototype.type = "VariableCall";
+VariableCall.prototype.eval = function (context) {
+    var detachedRuleset = new Variable(this.variable).eval(context);
+    return detachedRuleset.callEval(context);
+};
+module.exports = VariableCall;
+
+},{"./node":73,"./variable":85}],85:[function(require,module,exports){
 var Node = require("./node");
 
 var Variable = function (name, index, currentFileInfo) {
@@ -9188,9 +9615,9 @@ Variable.prototype.eval = function (context) {
 
     if (this.evaluating) {
         throw { type: 'Name',
-                message: "Recursive variable definition for " + name,
-                filename: this.fileInfo().filename,
-                index: this.getIndex() };
+            message: "Recursive variable definition for " + name,
+            filename: this.fileInfo().filename,
+            index: this.getIndex() };
     }
 
     this.evaluating = true;
@@ -9210,9 +9637,9 @@ Variable.prototype.eval = function (context) {
         return variable;
     } else {
         throw { type: 'Name',
-                message: "variable " + name + " is undefined",
-                filename: this.fileInfo().filename,
-                index: this.getIndex() };
+            message: "variable " + name + " is undefined",
+            filename: this.fileInfo().filename,
+            index: this.getIndex() };
     }
 };
 Variable.prototype.find = function (obj, fun) {
@@ -9225,6 +9652,7 @@ Variable.prototype.find = function (obj, fun) {
 module.exports = Variable;
 
 },{"./node":73}],86:[function(require,module,exports){
+/* jshint proto: true */
 module.exports = {
     getLocation: function(index, inputStream) {
         var n = index + 1,
@@ -9252,6 +9680,45 @@ module.exports = {
             copy[i] = arr[i];
         }
         return copy;
+    },
+    clone: function (obj) {
+        var cloned = {};
+        for (var prop in obj) {
+            if (obj.hasOwnProperty(prop)) {
+                cloned[prop] = obj[prop];
+            }
+        }
+        return cloned;
+    },
+    defaults: function(obj1, obj2) {
+        if (!obj2._defaults || obj2._defaults !== obj1) {
+            for (var prop in obj1) {
+                if (obj1.hasOwnProperty(prop)) {
+                    if (!obj2.hasOwnProperty(prop)) {
+                        obj2[prop] = obj1[prop];
+                    }
+                    else if (Array.isArray(obj1[prop])
+                        && Array.isArray(obj2[prop])) {
+
+                        obj1[prop].forEach(function(p) {
+                            if (obj2[prop].indexOf(p) === -1) {
+                                obj2[prop].push(p);
+                            }
+                        });
+                    }
+                }
+            }
+        }
+        obj2._defaults = obj1;
+        return obj2;
+    },
+    merge: function(obj1, obj2) {
+        for (var prop in obj2) {
+            if (obj2.hasOwnProperty(prop)) {
+                obj1[prop] = obj2[prop];
+            }
+        }
+        return obj1;
     }
 };
 
@@ -9261,7 +9728,7 @@ var tree = require("../tree"),
     logger = require("../logger"),
     utils = require("../utils");
 
-/*jshint loopfunc:true */
+/* jshint loopfunc:true */
 
 var ExtendFinderVisitor = function() {
     this._visitor = new Visitor(this);
@@ -9368,17 +9835,17 @@ ProcessExtendsVisitor.prototype = {
         extendList.filter(function(extend) {
             return !extend.hasFoundMatches && extend.parent_ids.length == 1;
         }).forEach(function(extend) {
-                var selector = "_unknown_";
-                try {
-                    selector = extend.selector.toCSS({});
-                }
-                catch(_) {}
+            var selector = "_unknown_";
+            try {
+                selector = extend.selector.toCSS({});
+            }
+            catch (_) {}
 
-                if (!indices[extend.index + ' ' + selector]) {
-                    indices[extend.index + ' ' + selector] = true;
-                    logger.warn("extend '" + selector + "' has no matches");
-                }
-            });
+            if (!indices[extend.index + ' ' + selector]) {
+                indices[extend.index + ' ' + selector] = true;
+                logger.warn("extend '" + selector + "' has no matches");
+            }
+        });
     },
     doExtendChaining: function (extendsList, extendsListTarget, iterationCount) {
         //
@@ -9395,7 +9862,7 @@ ProcessExtendsVisitor.prototype = {
 
         iterationCount = iterationCount || 0;
 
-        //loop through comparing every extend with every target extend.
+        // loop through comparing every extend with every target extend.
         // a target extend is the one on the ruleset we are looking at copy/edit/pasting in place
         // e.g.  .a:extend(.b) {}  and .b:extend(.c) {} then the first extend extends the second one
         // and the second is the target.
@@ -9461,7 +9928,7 @@ ProcessExtendsVisitor.prototype = {
                     selectorOne = extendsToAdd[0].selfSelectors[0].toCSS();
                     selectorTwo = extendsToAdd[0].selector.toCSS();
                 }
-                catch(e) {}
+                catch (e) {}
                 throw { message: "extend circular reference detected. One of the circular extends is currently:" +
                     selectorOne + ":extend(" + selectorTwo + ")"};
             }
@@ -9626,7 +10093,7 @@ ProcessExtendsVisitor.prototype = {
     },
     extendSelector:function (matches, selectorPath, replacementSelector, isVisible) {
 
-        //for a set of matches, replace each match with the replacement selector
+        // for a set of matches, replace each match with the replacement selector
 
         var currentSelectorPathIndex = 0,
             currentSelectorPathElementIndex = 0,
@@ -9718,7 +10185,7 @@ ProcessExtendsVisitor.prototype = {
 
 module.exports = ProcessExtendsVisitor;
 
-},{"../logger":35,"../tree":65,"../utils":86,"./visitor":94}],88:[function(require,module,exports){
+},{"../logger":37,"../tree":65,"../utils":86,"./visitor":94}],88:[function(require,module,exports){
 function ImportSequencer(onSequencerEmpty) {
     this.imports = [];
     this.variableImports = [];
@@ -9799,7 +10266,7 @@ ImportVisitor.prototype = {
             // process the contents
             this._visitor.visit(root);
         }
-        catch(e) {
+        catch (e) {
             this.error = e;
         }
 
@@ -9835,7 +10302,7 @@ ImportVisitor.prototype = {
 
         try {
             evaldImportNode = importNode.evalForImport(context);
-        } catch(e) {
+        } catch (e) {
             if (!e.filename) { e.index = importNode.getIndex(); e.filename = importNode.fileInfo().filename; }
             // attempt to eval properly and treat as css
             importNode.css = true;
@@ -10003,7 +10470,7 @@ JoinSelectorVisitor.prototype = {
 
         this.contexts.push(paths);
 
-        if (! rulesetNode.root) {
+        if (!rulesetNode.root) {
             selectors = rulesetNode.selectors;
             if (selectors) {
                 selectors = selectors.filter(function(selector) { return selector.getIsOutput(); });
@@ -10082,14 +10549,14 @@ var CSSVisitorUtils = function(context) {
 CSSVisitorUtils.prototype = {
     containsSilentNonBlockedChild: function(bodyRules) {
         var rule;
-        if (bodyRules == null) {
+        if (!bodyRules) {
             return false;
         }
         for (var r = 0; r < bodyRules.length; r++) {
             rule = bodyRules[r];
             if (rule.isSilent && rule.isSilent(this._context) && !rule.blocksVisibility()) {
-                //the atrule contains something that was referenced (likely by extend)
-                //therefore it needs to be shown in output too
+                // the atrule contains something that was referenced (likely by extend)
+                // therefore it needs to be shown in output too
                 return true;
             }
         }
@@ -10097,28 +10564,21 @@ CSSVisitorUtils.prototype = {
     },
 
     keepOnlyVisibleChilds: function(owner) {
-        if (owner == null || owner.rules == null) {
-            return ;
-        }
-
-        owner.rules = owner.rules.filter(function(thing) {
+        if (owner && owner.rules) {
+            owner.rules = owner.rules.filter(function(thing) {
                 return thing.isVisible();
-            }
-        );
+            });
+        }
     },
 
     isEmpty: function(owner) {
-        if (owner == null || owner.rules == null) {
-            return true;
-        }
-        return owner.rules.length === 0;
+        return (owner && owner.rules) 
+            ? (owner.rules.length === 0) : true;
     },
 
     hasVisibleSelector: function(rulesetNode) {
-        if (rulesetNode == null || rulesetNode.paths == null) {
-            return false;
-        }
-        return rulesetNode.paths.length > 0;
+        return (rulesetNode && rulesetNode.paths)
+            ? (rulesetNode.paths.length > 0) : false;
     },
 
     resolveVisibility: function (node, originalRules) {
@@ -10219,9 +10679,16 @@ ToCSSVisitor.prototype = {
         }
     },
 
+    visitAnonymous: function(anonymousNode, visitArgs) {
+        if (!anonymousNode.blocksVisibility()) {
+            anonymousNode.accept(this._visitor);
+            return anonymousNode;
+        }
+    },
+
     visitAtRuleWithBody: function(atRuleNode, visitArgs) {
-        //if there is only one nested ruleset and that one has no path, then it is
-        //just fake ruleset
+        // if there is only one nested ruleset and that one has no path, then it is
+        // just fake ruleset
         function hasFakeRuleset(atRuleNode) {
             var bodyRules = atRuleNode.rules;
             return bodyRules.length === 1 && (!bodyRules[0].paths || bodyRules[0].paths.length === 0);
@@ -10234,9 +10701,9 @@ ToCSSVisitor.prototype = {
 
             return nodeRules;
         }
-        //it is still true that it is only one ruleset in array
-        //this is last such moment
-        //process childs
+        // it is still true that it is only one ruleset in array
+        // this is last such moment
+        // process childs
         var originalRules = getBodyRules(atRuleNode);
         atRuleNode.accept(this._visitor);
         visitArgs.visitDeeper = false;
@@ -10294,13 +10761,13 @@ ToCSSVisitor.prototype = {
     },
 
     visitRuleset: function (rulesetNode, visitArgs) {
-        //at this point rulesets are nested into each other
+        // at this point rulesets are nested into each other
         var rule, rulesets = [];
 
         this.checkValidNodes(rulesetNode.rules, rulesetNode.firstRoot);
 
-        if (! rulesetNode.root) {
-            //remove invisible paths
+        if (!rulesetNode.root) {
+            // remove invisible paths
             this._compileRulesetPaths(rulesetNode);
 
             // remove rulesets from this ruleset body and compile them separately
@@ -10326,7 +10793,7 @@ ToCSSVisitor.prototype = {
             }
             visitArgs.visitDeeper = false;
 
-        } else { //if (! rulesetNode.root) {
+        } else { // if (! rulesetNode.root) {
             rulesetNode.accept(this._visitor);
             visitArgs.visitDeeper = false;
         }
@@ -10336,7 +10803,7 @@ ToCSSVisitor.prototype = {
             this._removeDuplicateRules(rulesetNode.rules);
         }
 
-        //now decide whether we keep the ruleset
+        // now decide whether we keep the ruleset
         if (this.utils.isVisibleRuleset(rulesetNode)) {
             rulesetNode.ensureVisibility();
             rulesets.splice(0, 0, rulesetNode);
@@ -10394,72 +10861,39 @@ ToCSSVisitor.prototype = {
         }
     },
 
-    _mergeRules: function (rules) {
-        if (!rules) { return; }
-
-        var groups = {},
-            parts,
-            rule,
-            key;
+    _mergeRules: function(rules) {
+        if (!rules) {
+            return; 
+        }
 
+        var groups    = {},
+            groupsArr = [];
+        
         for (var i = 0; i < rules.length; i++) {
-            rule = rules[i];
-
-            if ((rule instanceof tree.Declaration) && rule.merge) {
-                key = [rule.name,
-                    rule.important ? "!" : ""].join(",");
-
-                if (!groups[key]) {
-                    groups[key] = [];
-                } else {
-                    rules.splice(i--, 1);
-                }
-
+            var rule = rules[i];
+            if (rule.merge) {
+                var key = rule.name;
+                groups[key] ? rules.splice(i--, 1) : 
+                    groupsArr.push(groups[key] = []);
                 groups[key].push(rule);
             }
         }
 
-        Object.keys(groups).map(function (k) {
-
-            function toExpression(values) {
-                return new (tree.Expression)(values.map(function (p) {
-                    return p.value;
-                }));
-            }
-
-            function toValue(values) {
-                return new (tree.Value)(values.map(function (p) {
-                    return p;
-                }));
-            }
-
-            parts = groups[k];
-
-            if (parts.length > 1) {
-                rule = parts[0];
-                var spacedGroups = [];
-                var lastSpacedGroup = [];
-                parts.map(function (p) {
-                    if (p.merge === "+") {
-                        if (lastSpacedGroup.length > 0) {
-                            spacedGroups.push(toExpression(lastSpacedGroup));
-                        }
-                        lastSpacedGroup = [];
+        groupsArr.forEach(function(group) {
+            if (group.length > 0) {
+                var result = group[0],
+                    space  = [],
+                    comma  = [new tree.Expression(space)];
+                group.forEach(function(rule) {
+                    if ((rule.merge === '+') && (space.length > 0)) {
+                        comma.push(new tree.Expression(space = []));
                     }
-                    lastSpacedGroup.push(p);
+                    space.push(rule.value);
+                    result.important = result.important || rule.important;
                 });
-                spacedGroups.push(toExpression(lastSpacedGroup));
-                rule.value = toValue(spacedGroups);
+                result.value = new tree.Value(comma);
             }
         });
-    },
-
-    visitAnonymous: function(anonymousNode, visitArgs) {
-        if (anonymousNode.blocksVisibility()) {
-            return ;
-        }
-        anonymousNode.accept(this._visitor);
-        return anonymousNode;
     }
 };
 
@@ -10478,21 +10912,21 @@ function _noop(node) {
 function indexNodeTypes(parent, ticker) {
     // add .typeIndex to tree node types for lookup table
     var key, child;
-    for (key in parent) {
-        if (parent.hasOwnProperty(key)) {
-            child = parent[key];
-            switch (typeof child) {
-                case "function":
-                    // ignore bound functions directly on tree which do not have a prototype
-                    // or aren't nodes
-                    if (child.prototype && child.prototype.type) {
-                        child.prototype.typeIndex = ticker++;
-                    }
-                    break;
-                case "object":
-                    ticker = indexNodeTypes(child, ticker);
-                    break;
-            }
+    for (key in parent) { 
+        /* eslint guard-for-in: 0 */
+        child = parent[key];
+        switch (typeof child) {
+            case "function":
+                // ignore bound functions directly on tree which do not have a prototype
+                // or aren't nodes
+                if (child.prototype && child.prototype.type) {
+                    child.prototype.typeIndex = ticker++;
+                }
+                break;
+            case "object":
+                ticker = indexNodeTypes(child, ticker);
+                break;
+        
         }
     }
     return ticker;
@@ -10767,9 +11201,12 @@ function flush() {
 
 // Safari 6 and 6.1 for desktop, iPad, and iPhone are the only browsers that
 // have WebKitMutationObserver but not un-prefixed MutationObserver.
-// Must use `global` instead of `window` to work in both frames and web
+// Must use `global` or `self` instead of `window` to work in both frames and web
 // workers. `global` is a provision of Browserify, Mr, Mrs, or Mop.
-var BrowserMutationObserver = global.MutationObserver || global.WebKitMutationObserver;
+
+/* globals self */
+var scope = typeof global !== "undefined" ? global : self;
+var BrowserMutationObserver = scope.MutationObserver || scope.WebKitMutationObserver;
 
 // MutationObservers are desirable because they have high priority and work
 // reliably everywhere they are implemented.
@@ -10912,355 +11349,6 @@ rawAsap.makeRequestCallFromTimer = makeRequestCallFromTimer;
 
 }).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
 },{}],97:[function(require,module,exports){
-(function (process){
-// Copyright Joyent, Inc. and other Node contributors.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to permit
-// persons to whom the Software is furnished to do so, subject to the
-// following conditions:
-//
-// The above copyright notice and this permission notice shall be included
-// in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
-// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-// USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-// resolves . and .. elements in a path array with directory names there
-// must be no slashes, empty elements, or device names (c:\) in the array
-// (so also no leading and trailing slashes - it does not distinguish
-// relative and absolute paths)
-function normalizeArray(parts, allowAboveRoot) {
-  // if the path tries to go above the root, `up` ends up > 0
-  var up = 0;
-  for (var i = parts.length - 1; i >= 0; i--) {
-    var last = parts[i];
-    if (last === '.') {
-      parts.splice(i, 1);
-    } else if (last === '..') {
-      parts.splice(i, 1);
-      up++;
-    } else if (up) {
-      parts.splice(i, 1);
-      up--;
-    }
-  }
-
-  // if the path is allowed to go above the root, restore leading ..s
-  if (allowAboveRoot) {
-    for (; up--; up) {
-      parts.unshift('..');
-    }
-  }
-
-  return parts;
-}
-
-// Split a filename into [root, dir, basename, ext], unix version
-// 'root' is just a slash, or nothing.
-var splitPathRe =
-    /^(\/?|)([\s\S]*?)((?:\.{1,2}|[^\/]+?|)(\.[^.\/]*|))(?:[\/]*)$/;
-var splitPath = function(filename) {
-  return splitPathRe.exec(filename).slice(1);
-};
-
-// path.resolve([from ...], to)
-// posix version
-exports.resolve = function() {
-  var resolvedPath = '',
-      resolvedAbsolute = false;
-
-  for (var i = arguments.length - 1; i >= -1 && !resolvedAbsolute; i--) {
-    var path = (i >= 0) ? arguments[i] : process.cwd();
-
-    // Skip empty and invalid entries
-    if (typeof path !== 'string') {
-      throw new TypeError('Arguments to path.resolve must be strings');
-    } else if (!path) {
-      continue;
-    }
-
-    resolvedPath = path + '/' + resolvedPath;
-    resolvedAbsolute = path.charAt(0) === '/';
-  }
-
-  // At this point the path should be resolved to a full absolute path, but
-  // handle relative paths to be safe (might happen when process.cwd() fails)
-
-  // Normalize the path
-  resolvedPath = normalizeArray(filter(resolvedPath.split('/'), function(p) {
-    return !!p;
-  }), !resolvedAbsolute).join('/');
-
-  return ((resolvedAbsolute ? '/' : '') + resolvedPath) || '.';
-};
-
-// path.normalize(path)
-// posix version
-exports.normalize = function(path) {
-  var isAbsolute = exports.isAbsolute(path),
-      trailingSlash = substr(path, -1) === '/';
-
-  // Normalize the path
-  path = normalizeArray(filter(path.split('/'), function(p) {
-    return !!p;
-  }), !isAbsolute).join('/');
-
-  if (!path && !isAbsolute) {
-    path = '.';
-  }
-  if (path && trailingSlash) {
-    path += '/';
-  }
-
-  return (isAbsolute ? '/' : '') + path;
-};
-
-// posix version
-exports.isAbsolute = function(path) {
-  return path.charAt(0) === '/';
-};
-
-// posix version
-exports.join = function() {
-  var paths = Array.prototype.slice.call(arguments, 0);
-  return exports.normalize(filter(paths, function(p, index) {
-    if (typeof p !== 'string') {
-      throw new TypeError('Arguments to path.join must be strings');
-    }
-    return p;
-  }).join('/'));
-};
-
-
-// path.relative(from, to)
-// posix version
-exports.relative = function(from, to) {
-  from = exports.resolve(from).substr(1);
-  to = exports.resolve(to).substr(1);
-
-  function trim(arr) {
-    var start = 0;
-    for (; start < arr.length; start++) {
-      if (arr[start] !== '') break;
-    }
-
-    var end = arr.length - 1;
-    for (; end >= 0; end--) {
-      if (arr[end] !== '') break;
-    }
-
-    if (start > end) return [];
-    return arr.slice(start, end - start + 1);
-  }
-
-  var fromParts = trim(from.split('/'));
-  var toParts = trim(to.split('/'));
-
-  var length = Math.min(fromParts.length, toParts.length);
-  var samePartsLength = length;
-  for (var i = 0; i < length; i++) {
-    if (fromParts[i] !== toParts[i]) {
-      samePartsLength = i;
-      break;
-    }
-  }
-
-  var outputParts = [];
-  for (var i = samePartsLength; i < fromParts.length; i++) {
-    outputParts.push('..');
-  }
-
-  outputParts = outputParts.concat(toParts.slice(samePartsLength));
-
-  return outputParts.join('/');
-};
-
-exports.sep = '/';
-exports.delimiter = ':';
-
-exports.dirname = function(path) {
-  var result = splitPath(path),
-      root = result[0],
-      dir = result[1];
-
-  if (!root && !dir) {
-    // No dirname whatsoever
-    return '.';
-  }
-
-  if (dir) {
-    // It has a dirname, strip trailing slash
-    dir = dir.substr(0, dir.length - 1);
-  }
-
-  return root + dir;
-};
-
-
-exports.basename = function(path, ext) {
-  var f = splitPath(path)[2];
-  // TODO: make this comparison case-insensitive on windows?
-  if (ext && f.substr(-1 * ext.length) === ext) {
-    f = f.substr(0, f.length - ext.length);
-  }
-  return f;
-};
-
-
-exports.extname = function(path) {
-  return splitPath(path)[3];
-};
-
-function filter (xs, f) {
-    if (xs.filter) return xs.filter(f);
-    var res = [];
-    for (var i = 0; i < xs.length; i++) {
-        if (f(xs[i], i, xs)) res.push(xs[i]);
-    }
-    return res;
-}
-
-// String.prototype.substr - negative index don't work in IE8
-var substr = 'ab'.substr(-1) === 'b'
-    ? function (str, start, len) { return str.substr(start, len) }
-    : function (str, start, len) {
-        if (start < 0) start = str.length + start;
-        return str.substr(start, len);
-    }
-;
-
-}).call(this,require('_process'))
-},{"_process":98}],98:[function(require,module,exports){
-// shim for using process in browser
-
-var process = module.exports = {};
-
-// cached from whatever global is present so that test runners that stub it
-// don't break things.  But we need to wrap it in a try catch in case it is
-// wrapped in strict mode code which doesn't define any globals.  It's inside a
-// function because try/catches deoptimize in certain engines.
-
-var cachedSetTimeout;
-var cachedClearTimeout;
-
-(function () {
-  try {
-    cachedSetTimeout = setTimeout;
-  } catch (e) {
-    cachedSetTimeout = function () {
-      throw new Error('setTimeout is not defined');
-    }
-  }
-  try {
-    cachedClearTimeout = clearTimeout;
-  } catch (e) {
-    cachedClearTimeout = function () {
-      throw new Error('clearTimeout is not defined');
-    }
-  }
-} ())
-var queue = [];
-var draining = false;
-var currentQueue;
-var queueIndex = -1;
-
-function cleanUpNextTick() {
-    if (!draining || !currentQueue) {
-        return;
-    }
-    draining = false;
-    if (currentQueue.length) {
-        queue = currentQueue.concat(queue);
-    } else {
-        queueIndex = -1;
-    }
-    if (queue.length) {
-        drainQueue();
-    }
-}
-
-function drainQueue() {
-    if (draining) {
-        return;
-    }
-    var timeout = cachedSetTimeout(cleanUpNextTick);
-    draining = true;
-
-    var len = queue.length;
-    while(len) {
-        currentQueue = queue;
-        queue = [];
-        while (++queueIndex < len) {
-            if (currentQueue) {
-                currentQueue[queueIndex].run();
-            }
-        }
-        queueIndex = -1;
-        len = queue.length;
-    }
-    currentQueue = null;
-    draining = false;
-    cachedClearTimeout(timeout);
-}
-
-process.nextTick = function (fun) {
-    var args = new Array(arguments.length - 1);
-    if (arguments.length > 1) {
-        for (var i = 1; i < arguments.length; i++) {
-            args[i - 1] = arguments[i];
-        }
-    }
-    queue.push(new Item(fun, args));
-    if (queue.length === 1 && !draining) {
-        cachedSetTimeout(drainQueue, 0);
-    }
-};
-
-// v8 likes predictible objects
-function Item(fun, array) {
-    this.fun = fun;
-    this.array = array;
-}
-Item.prototype.run = function () {
-    this.fun.apply(null, this.array);
-};
-process.title = 'browser';
-process.browser = true;
-process.env = {};
-process.argv = [];
-process.version = ''; // empty string to avoid regexp issues
-process.versions = {};
-
-function noop() {}
-
-process.on = noop;
-process.addListener = noop;
-process.once = noop;
-process.off = noop;
-process.removeListener = noop;
-process.removeAllListeners = noop;
-process.emit = noop;
-
-process.binding = function (name) {
-    throw new Error('process.binding is not supported');
-};
-
-process.cwd = function () { return '/' };
-process.chdir = function (dir) {
-    throw new Error('process.chdir is not supported');
-};
-process.umask = function() { return 0; };
-
-},{}],99:[function(require,module,exports){
 'use strict';
 
 var asap = require('asap/raw');
@@ -11319,17 +11407,17 @@ function Promise(fn) {
     throw new TypeError('Promises must be constructed via new');
   }
   if (typeof fn !== 'function') {
-    throw new TypeError('not a function');
+    throw new TypeError('Promise constructor\'s argument is not a function');
   }
-  this._45 = 0;
-  this._81 = 0;
-  this._65 = null;
-  this._54 = null;
+  this._40 = 0;
+  this._65 = 0;
+  this._55 = null;
+  this._72 = null;
   if (fn === noop) return;
   doResolve(fn, this);
 }
-Promise._10 = null;
-Promise._97 = null;
+Promise._37 = null;
+Promise._87 = null;
 Promise._61 = noop;
 
 Promise.prototype.then = function(onFulfilled, onRejected) {
@@ -11347,26 +11435,26 @@ function safeThen(self, onFulfilled, onRejected) {
     res.then(resolve, reject);
     handle(self, new Handler(onFulfilled, onRejected, res));
   });
-};
+}
 function handle(self, deferred) {
-  while (self._81 === 3) {
-    self = self._65;
+  while (self._65 === 3) {
+    self = self._55;
   }
-  if (Promise._10) {
-    Promise._10(self);
+  if (Promise._37) {
+    Promise._37(self);
   }
-  if (self._81 === 0) {
-    if (self._45 === 0) {
-      self._45 = 1;
-      self._54 = deferred;
+  if (self._65 === 0) {
+    if (self._40 === 0) {
+      self._40 = 1;
+      self._72 = deferred;
       return;
     }
-    if (self._45 === 1) {
-      self._45 = 2;
-      self._54 = [self._54, deferred];
+    if (self._40 === 1) {
+      self._40 = 2;
+      self._72 = [self._72, deferred];
       return;
     }
-    self._54.push(deferred);
+    self._72.push(deferred);
     return;
   }
   handleResolved(self, deferred);
@@ -11374,16 +11462,16 @@ function handle(self, deferred) {
 
 function handleResolved(self, deferred) {
   asap(function() {
-    var cb = self._81 === 1 ? deferred.onFulfilled : deferred.onRejected;
+    var cb = self._65 === 1 ? deferred.onFulfilled : deferred.onRejected;
     if (cb === null) {
-      if (self._81 === 1) {
-        resolve(deferred.promise, self._65);
+      if (self._65 === 1) {
+        resolve(deferred.promise, self._55);
       } else {
-        reject(deferred.promise, self._65);
+        reject(deferred.promise, self._55);
       }
       return;
     }
-    var ret = tryCallOne(cb, self._65);
+    var ret = tryCallOne(cb, self._55);
     if (ret === IS_ERROR) {
       reject(deferred.promise, LAST_ERROR);
     } else {
@@ -11411,8 +11499,8 @@ function resolve(self, newValue) {
       then === self.then &&
       newValue instanceof Promise
     ) {
-      self._81 = 3;
-      self._65 = newValue;
+      self._65 = 3;
+      self._55 = newValue;
       finale(self);
       return;
     } else if (typeof then === 'function') {
@@ -11420,29 +11508,29 @@ function resolve(self, newValue) {
       return;
     }
   }
-  self._81 = 1;
-  self._65 = newValue;
+  self._65 = 1;
+  self._55 = newValue;
   finale(self);
 }
 
 function reject(self, newValue) {
-  self._81 = 2;
-  self._65 = newValue;
-  if (Promise._97) {
-    Promise._97(self, newValue);
+  self._65 = 2;
+  self._55 = newValue;
+  if (Promise._87) {
+    Promise._87(self, newValue);
   }
   finale(self);
 }
 function finale(self) {
-  if (self._45 === 1) {
-    handle(self, self._54);
-    self._54 = null;
+  if (self._40 === 1) {
+    handle(self, self._72);
+    self._72 = null;
   }
-  if (self._45 === 2) {
-    for (var i = 0; i < self._54.length; i++) {
-      handle(self, self._54[i]);
+  if (self._40 === 2) {
+    for (var i = 0; i < self._72.length; i++) {
+      handle(self, self._72[i]);
     }
-    self._54 = null;
+    self._72 = null;
   }
 }
 
@@ -11468,14 +11556,14 @@ function doResolve(fn, promise) {
     if (done) return;
     done = true;
     reject(promise, reason);
-  })
+  });
   if (!done && res === IS_ERROR) {
     done = true;
     reject(promise, LAST_ERROR);
   }
 }
 
-},{"asap/raw":96}],100:[function(require,module,exports){
+},{"asap/raw":96}],98:[function(require,module,exports){
 'use strict';
 
 //This file contains the ES6 extensions to the core Promises/A+ API
@@ -11495,8 +11583,8 @@ var EMPTYSTRING = valuePromise('');
 
 function valuePromise(value) {
   var p = new Promise(Promise._61);
-  p._81 = 1;
-  p._65 = value;
+  p._65 = 1;
+  p._55 = value;
   return p;
 }
 Promise.resolve = function (value) {
@@ -11533,11 +11621,11 @@ Promise.all = function (arr) {
     function res(i, val) {
       if (val && (typeof val === 'object' || typeof val === 'function')) {
         if (val instanceof Promise && val.then === Promise.prototype.then) {
-          while (val._81 === 3) {
-            val = val._65;
+          while (val._65 === 3) {
+            val = val._55;
           }
-          if (val._81 === 1) return res(i, val._65);
-          if (val._81 === 2) reject(val._65);
+          if (val._65 === 1) return res(i, val._55);
+          if (val._65 === 2) reject(val._55);
           val.then(function (val) {
             res(i, val);
           }, reject);
@@ -11584,7 +11672,7 @@ Promise.prototype['catch'] = function (onRejected) {
   return this.then(null, onRejected);
 };
 
-},{"./core.js":99}],101:[function(require,module,exports){
+},{"./core.js":97}],99:[function(require,module,exports){
 // should work in any browser without browserify
 
 if (typeof Promise.prototype.done !== 'function') {
@@ -11597,7 +11685,7 @@ if (typeof Promise.prototype.done !== 'function') {
     })
   }
 }
-},{}],102:[function(require,module,exports){
+},{}],100:[function(require,module,exports){
 // not "use strict" so we can declare global "Promise"
 
 var asap = require('asap');
@@ -11609,5 +11697,5 @@ if (typeof Promise === 'undefined') {
 
 require('./polyfill-done.js');
 
-},{"./lib/core.js":99,"./lib/es6-extensions.js":100,"./polyfill-done.js":101,"asap":95}]},{},[2])(2)
+},{"./lib/core.js":97,"./lib/es6-extensions.js":98,"./polyfill-done.js":99,"asap":95}]},{},[2])(2)
 });