diff --git a/CHANGELOG.md b/CHANGELOG.md
index 25ecbfb..007c6e2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,10 +1,16 @@
 # Changes for jscc
 
+### v0.3.2 @ 2016-10-22
+
+- Fixes an issue with losing location in sourceMap after replacing memvars.
+- Now JSCC always returns an object, even if there were no changes.
+- Updated `devDependencies`.
+
 ### v0.3.1 @ 2016-10-14
 
 - Source map includes the source filename (needed by jscc-brunch).
 - Removed jscc own source maps from the distribution.
-- The CommonJS version validated by Coverty Scan.
+- The CommonJS version is validated by Coverty Scan.
 
 ### v0.3.0 @ 2016-10-06
 
diff --git a/lib/jscc.es.js b/lib/jscc.es.js
index fdf14a8..4310082 100644
--- a/lib/jscc.es.js
+++ b/lib/jscc.es.js
@@ -6,22 +6,22 @@ import { join, relative } from 'path';
  */
 
 // name=value in directives - $1:name, $2:value (including any comment)
-var VARPAIR = /^\s*(_[0-9A-Z][_0-9A-Z]*)\s*=?(.*)/
+var VARPAIR = /^\s*(_[0-9A-Z][_0-9A-Z]*)\s*=?(.*)/;
 
 // to verify valid varnames and for #unset
-var VARNAME = /^_[0-9A-Z][_0-9A-Z]*$/
+var VARNAME = /^_[0-9A-Z][_0-9A-Z]*$/;
 
 // prefixing varnames inside expression with `this.` or `global.`
-var EVLVARS = /(^|[^$\w\.])(_[0-9A-Z][_0-9A-Z]*)\b(?=[^$\w]|$)/g
+var EVLVARS = /(^|[^$\w\.])(_[0-9A-Z][_0-9A-Z]*)\b(?=[^$\w]|$)/g;
 
 // replace varnames inside the code from $_VAR.prop to value
-var REPVARS = /(?:(\$_[0-9A-Z][_0-9A-Z]*)(\.[\w]+)?)(?=[\W]|$)/g
+var REPVARS = /(?:(\$_[0-9A-Z][_0-9A-Z]*)(\.[\w]+)?)(?=[\W]|$)/g;
 
 // matches single and double quoted strings, take care about embedded eols
-var STRINGS = /"[^"\n\r\\]*(?:\\(?:\r\n?|[\S\s])[^"\n\r\\]*)*"|'[^'\n\r\\]*(?:\\(?:\r\n?|[\S\s])[^'\n\r\\]*)*'/g
+var STRINGS = /"[^"\n\r\\]*(?:\\(?:\r\n?|[\S\s])[^"\n\r\\]*)*"|'[^'\n\r\\]*(?:\\(?:\r\n?|[\S\s])[^'\n\r\\]*)*'/g;
 
 // For replacing of jspreproc variables ($1 = prefix, $2 = varname)
-var _REPVARS = RegExp(((STRINGS.source) + "|" + (EVLVARS.source)), 'g')
+var _REPVARS = RegExp(((STRINGS.source) + "|" + (EVLVARS.source)), 'g');
 
 /**
  * Method to perform the evaluation of the received string using
@@ -32,29 +32,29 @@ var _REPVARS = RegExp(((STRINGS.source) + "|" + (EVLVARS.source)), 'g')
  * @returns {any}          The result.
  */
 function evalExpr (ctx, str) {
-  var values = ctx.options.values
+  var values = ctx.options.values;
 
   // var replacement
   var _repVars = function (m, p, v) {
     return v
       ? p + (v in values ? ("this." + v) : v in global ? ("global." + v) : 'undefined')
       : m
-  }
+  };
 
   var expr = str
     .replace(/\n/g, '\\n')
     .replace(/\r/g, '\\r')
-    .replace(_REPVARS, _repVars)
+    .replace(_REPVARS, _repVars);
 
-  var result
+  var result;
 
   try {
     // eslint-disable-next-line no-new-func
-    var fn = new Function('', ("return (" + expr + ");"))
-    result = fn.call(values)
+    var fn = new Function('', ("return (" + expr + ");"));
+    result = fn.call(values);
   } catch (e) {
-    result = false
-    ctx._emitError(((e.message) + " in expression \"" + expr + "\""))
+    result = false;
+    ctx._emitError(((e.message) + " in expression \"" + expr + "\""));
   }
 
   return result
@@ -64,24 +64,24 @@ function evalExpr (ctx, str) {
     Parser for conditional comments
  */
 // branch type
-var NONE = 0
-var IF   = 1
-var ELSE = 2
+var NONE = 0;
+var IF   = 1;
+var ELSE = 2;
 
 // status
-var WORKING = 0
-var TESTING = 1
-var ENDING  = 2
-var ERROR   = 3
+var WORKING = 0;
+var TESTING = 1;
+var ENDING  = 2;
+var ERROR   = 3;
 
 // These characters have to be escaped.
-var R_ESCAPED = /(?=[-[{()*+?.^$|\\])/g
+var R_ESCAPED = /(?=[-[{()*+?.^$|\\])/g;
 
 // Matches a line with a directive, not including line-ending
-var S_RE_BASE = /^[ \t\f\v]*(?:@)#(if|ifn?set|el(?:if|se)|endif|set|unset|error)(?:(?=[ \t])(.*)|\/\/.*)?$/.source
+var S_RE_BASE = /^[ \t\f\v]*(?:@)#(if|ifn?set|el(?:if|se)|endif|set|unset|error)(?:(?=[ \t])(.*)|\/\/.*)?$/.source;
 
 // Match a substring that includes the first unquoted `//`
-var R_LASTCMT = new RegExp(((STRINGS.source) + "|(//)"), 'g')
+var R_LASTCMT = new RegExp(((STRINGS.source) + "|(//)"), 'g');
 
 
 /**
@@ -91,11 +91,11 @@ var R_LASTCMT = new RegExp(((STRINGS.source) + "|(//)"), 'g')
  * @class
  */
 function Parser (options) {
-  this.options = options
+  this.options = options;
   this.cc = [{
     state: WORKING,
     block: NONE
-  }]
+  }];
 }
 
 
@@ -107,17 +107,17 @@ Parser.prototype = {
    * @returns {boolean}       Output state, `false` to hide the output.
    */
   parse: function parse (match) {         //eslint-disable-line complexity
-    var self = this
-    var cc   = self.cc
-    var ccInfo = cc[cc.length - 1]
-    var state  = ccInfo.state
+    var self = this;
+    var cc   = self.cc;
+    var ccInfo = cc[cc.length - 1];
+    var state  = ccInfo.state;
 
     if (state === ERROR) {
       return false
     }
 
-    var key  = match[1]
-    var expr = self._normalize(key, match[2])
+    var key  = match[1];
+    var expr = self._normalize(key, match[2]);
 
     switch (key) {
       // Conditional blocks -- `#if-ifset-ifnset` pushes the state and `#endif` pop it
@@ -125,33 +125,33 @@ Parser.prototype = {
       case 'ifset':
       case 'ifnset':
         if (state !== ENDING) {
-          state = self._getValue(key, expr) ? WORKING : TESTING
+          state = self._getValue(key, expr) ? WORKING : TESTING;
         }
-        ccInfo = { state: state, block: IF }
-        cc.push(ccInfo)
+        ccInfo = { state: state, block: IF };
+        cc.push(ccInfo);
         break
 
       case 'elif':
         if (_checkBlock(IF)) {
           if (state === TESTING && self._getValue('if', expr)) {
-            ccInfo.state = WORKING
+            ccInfo.state = WORKING;
           } else if (state === WORKING) {
-            ccInfo.state = ENDING
+            ccInfo.state = ENDING;
           }
         }
         break
 
       case 'else':
         if (_checkBlock(IF)) {
-          ccInfo.block = ELSE
-          ccInfo.state = state === TESTING ? WORKING : ENDING
+          ccInfo.block = ELSE;
+          ccInfo.state = state === TESTING ? WORKING : ENDING;
         }
         break
 
       case 'endif':
         if (_checkBlock(IF | ELSE)) {
-          cc.pop()
-          ccInfo = cc[cc.length - 1]
+          cc.pop();
+          ccInfo = cc[cc.length - 1];
         }
         break
 
@@ -160,13 +160,13 @@ Parser.prototype = {
         if (state === WORKING) {
           switch (key) {
             case 'set':
-              self._set(expr)
+              self._set(expr);
               break
             case 'unset':
-              self._unset(expr)
+              self._unset(expr);
               break
             case 'error':
-              self._error(expr)
+              self._error(expr);
               //_error throws
           }
         }
@@ -177,12 +177,12 @@ Parser.prototype = {
 
     // Inner helper - throws if the current block is not of the expected type
     function _checkBlock (mask) {
-      var block = ccInfo.block
+      var block = ccInfo.block;
 
       if (block !== NONE && block === (block & mask)) {
         return true
       }
-      self._emitError(("Unexpected #" + key))
+      self._emitError(("Unexpected #" + key));
       return false
     }
   },
@@ -193,14 +193,14 @@ Parser.prototype = {
    * @returns {boolean} `true` if no error.
    */
   close: function close () {
-    var cc  = this.cc
-    var len = cc.length
-    var err = len !== 1 || cc[0].state !== WORKING
+    var cc  = this.cc;
+    var len = cc.length;
+    var err = len !== 1 || cc[0].state !== WORKING;
 
     if (err && cc[0].state !== ERROR) {
-      this._emitError('Unexpected end of file')
+      this._emitError('Unexpected end of file');
     }
-    this.options = false
+    this.options = false;
     return !err
   },
 
@@ -212,7 +212,7 @@ Parser.prototype = {
   getRegex: function getRegex () {
     var list = this.options.prefixes
                 .map(function (s) { return s.replace(R_ESCAPED, '\\'); })
-                .join('|')
+                .join('|');
 
     return RegExp(S_RE_BASE.replace('@', list), 'gm')
   },
@@ -224,13 +224,13 @@ Parser.prototype = {
    * @param {string} message - Error description
    */
   _emitError: function _emitError (message) {
-    var errFn = this.options.errorHandler
+    var errFn = this.options.errorHandler;
 
     //message = `jspp [${this.cc.fname || 'input'}] : ${message}`
-    this.cc[this.cc.length - 1].state = this.cc[0].state = ERROR
+    this.cc[this.cc.length - 1].state = this.cc[0].state = ERROR;
 
     if (typeof errFn == 'function') {
-      errFn(message)
+      errFn(message);
     } else {
       throw new Error(message)
     }
@@ -252,13 +252,13 @@ Parser.prototype = {
     }
     // ...other keywords must have an expression
     if (!expr) {
-      this._emitError(("Expression expected for #" + ckey))
+      this._emitError(("Expression expected for #" + ckey));
     }
-    var match
-    R_LASTCMT.lastIndex = 0
+    var match;
+    R_LASTCMT.lastIndex = 0;
     while ((match = R_LASTCMT.exec(expr))) {
       if (match[1]) {
-        expr = expr.slice(0, match.index)
+        expr = expr.slice(0, match.index);
         break
       }
     }
@@ -274,7 +274,7 @@ Parser.prototype = {
    */
   _getValue: function _getValue (ckey, expr) {
     if (ckey !== 'if') {
-      var yes = expr in this.options.values ? 1 : 0
+      var yes = expr in this.options.values ? 1 : 0;
 
       return ckey === 'ifnset' ? yes ^ 1 : yes
     }
@@ -283,36 +283,36 @@ Parser.prototype = {
   },
 
   _set: function _set (s) {
-    var m = s.match(VARPAIR)
+    var m = s.match(VARPAIR);
     if (m) {
-      var k = m[1]
-      var v = m[2]
+      var k = m[1];
+      var v = m[2];
 
-      this.options.values[k] = v ? evalExpr(this, v.trim()) : undefined
+      this.options.values[k] = v ? evalExpr(this, v.trim()) : undefined;
     } else {
-      this._emitError(("Invalid memvar assignment \"" + s + "\""))
+      this._emitError(("Invalid memvar assignment \"" + s + "\""));
     }
   },
 
   _unset: function _unset (s) {
-    var def = s.match(VARNAME)
+    var def = s.match(VARNAME);
     if (def) {
-      delete this.options.values[s]
+      delete this.options.values[s];
     } else {
-      this._emitError(("Invalid memvar name \"" + s + "\""))
+      this._emitError(("Invalid memvar name \"" + s + "\""));
     }
   },
 
   _error: function _error (s) {
-    s = evalExpr(this, s)
+    s = evalExpr(this, s);
     throw new Error(s)
   }
-}
+};
 
 function checkOptions (opts) {
-  if (!opts) { opts = {} }
+  if (!opts) { opts = {}; }
 
-  var values = opts.values || (opts.values = {})
+  var values = opts.values || (opts.values = {});
 
   if (typeof opts.values != 'object') {
     throw new Error('jscc values must be a plain object')
@@ -320,32 +320,32 @@ function checkOptions (opts) {
 
   // set _VERSION once in the options
   if (values._VERSION == null) {
-    var path$$1 = process.cwd().replace(/\\/g, '/')
-    var pack, version = '?'
+    var path$$1 = process.cwd().replace(/\\/g, '/');
+    var pack, version = '?';
 
     while (~path$$1.indexOf('/')) {
-      pack = join(path$$1, 'package.json')
+      pack = join(path$$1, 'package.json');
       try {
-        version = require(pack).version
+        version = require(pack).version;
         break
       } catch (_) {/**/}
-      path$$1 = path$$1.replace(/\/[^/]*$/, '')
+      path$$1 = path$$1.replace(/\/[^/]*$/, '');
     }
-    values._VERSION = version
+    values._VERSION = version;
   }
 
   Object.keys(opts.values).forEach(function (v) {
     if (!VARNAME.test(v)) {
       throw new Error(("Invalid memvar name: " + v))
     }
-  })
+  });
 
   // sequence starting a directive
-  var prefixes = opts.prefixes
+  var prefixes = opts.prefixes;
   if (!prefixes) {
-    opts.prefixes = ['//', '/*', '<!--']
+    opts.prefixes = ['//', '/*', '<!--'];
   } else if (typeof prefixes == 'string') {
-    opts.prefixes = [prefixes]
+    opts.prefixes = [prefixes];
   } else if (!Array.isArray(prefixes)) {
     throw new Error('`prefixes` must be an array')
   }
@@ -355,22 +355,24 @@ function checkOptions (opts) {
 
 function parseOptions (file, opts) {
 
-  opts = checkOptions(opts)
+  opts = checkOptions(opts);
 
   // shallow copy of the values, must be set per file
-  var values = {}
-  var source = opts.values
+  var values = {};
+  var source = opts.values;
 
-  Object.keys(source).forEach(function (v) { values[v] = source[v] })
+  Object.keys(source).forEach(function (v) { values[v] = source[v]; });
 
   // file is readonly and valid only for this instance
   Object.defineProperty(values, '_FILE', {
     value: file && relative(process.cwd(), file).replace(/\\/g, '/') || '',
     enumerable: true
-  })
+  });
 
   return {
     sourceMap:    opts.sourceMap !== false,
+    mapContent:   opts.mapContent,
+    mapHires:     opts.mapHires,
     keepLines:    opts.keepLines,
     errorHandler: opts.errorHandler,
     prefixes:     opts.prefixes,
@@ -380,29 +382,32 @@ function parseOptions (file, opts) {
 
 // for matching all vars inside code
 function remapVars (magicStr, values, str, start) {
-  var re = REPVARS
-  var mm
-  var changes = false
+  var re = REPVARS;
+  var mm;
+  var changes = false;
 
-  re.lastIndex = 0  // `re` is global, so reset
+  re.lastIndex = 0;  // `re` is global, so reset
+
+  // $1 = varname including the prefix '$'
+  // $2 = optional point + property name
 
   while ((mm = re.exec(str))) {
-    var v = mm[1].slice(1)
+    var v = mm[1].slice(1);
 
     if (v in values) {
-      var p   = mm[2] && mm[2].slice(1)
-      var idx = start + mm.index
+      var p   = mm[2] && mm[2].slice(1);
+      var idx = start + mm.index;
 
-      v = values[v]
+      v = values[v];
       if (p && p in v) {
-        v = v[p]
-        mm[1] += mm[2]
+        v = v[p];
+        mm[1] = mm[0];
       } else if (typeof v == 'object') {
-        v = JSON.stringify(v)
+        v = JSON.stringify(v);
       }
 
-      magicStr.overwrite(idx, idx + mm[1].length, String(v))
-      changes = true
+      magicStr.overwrite(idx, idx + mm[1].length, String(v));
+      changes = true;
     }
   }
 
@@ -415,107 +420,103 @@ function remapVars (magicStr, values, str, start) {
  */
 function preproc (code, filename, options) {
 
-  options = parseOptions(filename, options)
+  options = parseOptions(filename, options);
 
-  var magicStr  = new MagicString(code)
-  var parser    = new Parser(options)
+  var magicStr  = new MagicString(code);
+  var parser    = new Parser(options);
 
-  var re = parser.getRegex()  // $1:keyword, $2:expression
+  var re = parser.getRegex();  // $1:keyword, $2:expression
 
-  var changes   = false
-  var output    = true
-  var realStart = 0
-  var hideStart = 0
-  var lastIndex = 0
-  var match, index
+  var changes   = false;
+  var output    = true;
+  var hideStart = 0;
+  var lastIndex = 0;
+  var match, index;
 
-  re.lastIndex = 0
+  re.lastIndex = 0;
 
   while ((match = re.exec(code))) {
 
-    index = match.index
+    index = match.index;
 
-    if (output && lastIndex < index) {
-      pushCache(code.slice(lastIndex, index), lastIndex)
+    if (output && lastIndex < index &&
+        pushCache(code.slice(lastIndex, index), lastIndex)) {
+      changes = true;
     }
 
-    lastIndex = re.lastIndex
+    lastIndex = re.lastIndex;
 
     if (output === parser.parse(match)) {
       if (output) {
-        lastIndex = removeBlock(index, lastIndex)
+        lastIndex = removeBlock(index, lastIndex);
+        changes = true;
       }
+    } else if (output) {
+      // output ends, for now, all we do is to save
+      // the pos where the hidden block begins
+      hideStart = index;
+      output = false;
     } else {
-      output = !output
-      if (output) {
-        // output begins, remove the hidden block now
-        lastIndex = removeBlock(hideStart, lastIndex)
-      } else {
-        // output ends, for now, all we do is to save
-        // the pos where the hidden block begins
-        hideStart = index
-      }
+      // output begins, remove the hidden block now
+      lastIndex = removeBlock(hideStart, lastIndex);
+      output = changes = true;
     }
 
   }
 
   if (!parser.close()) {  // let parser to detect unbalanced blocks
-    output = false
+    output = false;
   }
 
-  if (output && code.length > lastIndex) {
-    pushCache(code.slice(lastIndex), lastIndex)
+  if (output && code.length > lastIndex &&
+      pushCache(code.slice(lastIndex), lastIndex)) {
+    changes = true;
   }
 
-  // done, return an object if there was changes
-  if (changes) {
-    var result = {
-      code: magicStr.toString()
-    }
-    if (changes && options.sourceMap) {
-      var name = options.values._FILE
-
-      result.map = magicStr.generateMap({
-        source: name,
-        file: name.split(/[\\/]/).pop(),
-        hires: true
-      })
-    }
-    return result
+  // always returns an object
+  var result = {
+    code: changes ? magicStr.toString() : code
+  };
+
+  if (changes && options.sourceMap) {
+    var name = filename || null;
+
+    result.map = magicStr.generateMap({
+      source: name,
+      file: name && ((name.split(/[\\/]/).pop()) + ".map"),
+      includeContent: options.mapContent !== false,
+      hires: options.mapHires !== false
+    });
   }
 
-  return code
+  return result
 
   // helpers ==============================================
 
   function pushCache (str, start) {
-    if (str && ~str.indexOf('$_')) {
-      changes = remapVars(magicStr, options.values, str, start) || changes
+    var change = str && ~str.indexOf('$_');
+
+    if (change) {
+      change = remapVars(magicStr, options.values, str, start);
     }
+
+    return change
   }
 
   function removeBlock (start, end) {
-    var block = ''
+    var block = '';
 
     if (options.keepLines) {
-      block = code.slice(start, end).replace(/[^\r\n]+/g, '')
+      block = code.slice(start, end).replace(/[^\r\n]+/g, '');
 
-    // @TODO: Remove first jscc lines
-    } else if (start > realStart) {
-      --start
-      if (code[start] === '\n' && code[start - 1] === '\r') {
-        --start
-      }
-    } else if (end < code.length && /[\n\r]/.test(code[end])) {
-      ++end
+    } else if (end < code.length) {
+      ++end;
       if (code[end] === '\n' && code[end - 1] === '\r') {
-        ++end
+        ++end;
       }
-      realStart = end
     }
-    magicStr.overwrite(start, end, block)
-    changes = true
 
+    magicStr.overwrite(start, end, block);
     return end
   }
 }
diff --git a/lib/jscc.js b/lib/jscc.js
index 08b932b..34cee53 100644
--- a/lib/jscc.js
+++ b/lib/jscc.js
@@ -8,22 +8,22 @@ var path = require('path');
  */
 
 // name=value in directives - $1:name, $2:value (including any comment)
-var VARPAIR = /^\s*(_[0-9A-Z][_0-9A-Z]*)\s*=?(.*)/
+var VARPAIR = /^\s*(_[0-9A-Z][_0-9A-Z]*)\s*=?(.*)/;
 
 // to verify valid varnames and for #unset
-var VARNAME = /^_[0-9A-Z][_0-9A-Z]*$/
+var VARNAME = /^_[0-9A-Z][_0-9A-Z]*$/;
 
 // prefixing varnames inside expression with `this.` or `global.`
-var EVLVARS = /(^|[^$\w\.])(_[0-9A-Z][_0-9A-Z]*)\b(?=[^$\w]|$)/g
+var EVLVARS = /(^|[^$\w\.])(_[0-9A-Z][_0-9A-Z]*)\b(?=[^$\w]|$)/g;
 
 // replace varnames inside the code from $_VAR.prop to value
-var REPVARS = /(?:(\$_[0-9A-Z][_0-9A-Z]*)(\.[\w]+)?)(?=[\W]|$)/g
+var REPVARS = /(?:(\$_[0-9A-Z][_0-9A-Z]*)(\.[\w]+)?)(?=[\W]|$)/g;
 
 // matches single and double quoted strings, take care about embedded eols
-var STRINGS = /"[^"\n\r\\]*(?:\\(?:\r\n?|[\S\s])[^"\n\r\\]*)*"|'[^'\n\r\\]*(?:\\(?:\r\n?|[\S\s])[^'\n\r\\]*)*'/g
+var STRINGS = /"[^"\n\r\\]*(?:\\(?:\r\n?|[\S\s])[^"\n\r\\]*)*"|'[^'\n\r\\]*(?:\\(?:\r\n?|[\S\s])[^'\n\r\\]*)*'/g;
 
 // For replacing of jspreproc variables ($1 = prefix, $2 = varname)
-var _REPVARS = RegExp(((STRINGS.source) + "|" + (EVLVARS.source)), 'g')
+var _REPVARS = RegExp(((STRINGS.source) + "|" + (EVLVARS.source)), 'g');
 
 /**
  * Method to perform the evaluation of the received string using
@@ -34,29 +34,29 @@ var _REPVARS = RegExp(((STRINGS.source) + "|" + (EVLVARS.source)), 'g')
  * @returns {any}          The result.
  */
 function evalExpr (ctx, str) {
-  var values = ctx.options.values
+  var values = ctx.options.values;
 
   // var replacement
   var _repVars = function (m, p, v) {
     return v
       ? p + (v in values ? ("this." + v) : v in global ? ("global." + v) : 'undefined')
       : m
-  }
+  };
 
   var expr = str
     .replace(/\n/g, '\\n')
     .replace(/\r/g, '\\r')
-    .replace(_REPVARS, _repVars)
+    .replace(_REPVARS, _repVars);
 
-  var result
+  var result;
 
   try {
     // eslint-disable-next-line no-new-func
-    var fn = new Function('', ("return (" + expr + ");"))
-    result = fn.call(values)
+    var fn = new Function('', ("return (" + expr + ");"));
+    result = fn.call(values);
   } catch (e) {
-    result = false
-    ctx._emitError(((e.message) + " in expression \"" + expr + "\""))
+    result = false;
+    ctx._emitError(((e.message) + " in expression \"" + expr + "\""));
   }
 
   return result
@@ -66,24 +66,24 @@ function evalExpr (ctx, str) {
     Parser for conditional comments
  */
 // branch type
-var NONE = 0
-var IF   = 1
-var ELSE = 2
+var NONE = 0;
+var IF   = 1;
+var ELSE = 2;
 
 // status
-var WORKING = 0
-var TESTING = 1
-var ENDING  = 2
-var ERROR   = 3
+var WORKING = 0;
+var TESTING = 1;
+var ENDING  = 2;
+var ERROR   = 3;
 
 // These characters have to be escaped.
-var R_ESCAPED = /(?=[-[{()*+?.^$|\\])/g
+var R_ESCAPED = /(?=[-[{()*+?.^$|\\])/g;
 
 // Matches a line with a directive, not including line-ending
-var S_RE_BASE = /^[ \t\f\v]*(?:@)#(if|ifn?set|el(?:if|se)|endif|set|unset|error)(?:(?=[ \t])(.*)|\/\/.*)?$/.source
+var S_RE_BASE = /^[ \t\f\v]*(?:@)#(if|ifn?set|el(?:if|se)|endif|set|unset|error)(?:(?=[ \t])(.*)|\/\/.*)?$/.source;
 
 // Match a substring that includes the first unquoted `//`
-var R_LASTCMT = new RegExp(((STRINGS.source) + "|(//)"), 'g')
+var R_LASTCMT = new RegExp(((STRINGS.source) + "|(//)"), 'g');
 
 
 /**
@@ -93,11 +93,11 @@ var R_LASTCMT = new RegExp(((STRINGS.source) + "|(//)"), 'g')
  * @class
  */
 function Parser (options) {
-  this.options = options
+  this.options = options;
   this.cc = [{
     state: WORKING,
     block: NONE
-  }]
+  }];
 }
 
 
@@ -109,17 +109,17 @@ Parser.prototype = {
    * @returns {boolean}       Output state, `false` to hide the output.
    */
   parse: function parse (match) {         //eslint-disable-line complexity
-    var self = this
-    var cc   = self.cc
-    var ccInfo = cc[cc.length - 1]
-    var state  = ccInfo.state
+    var self = this;
+    var cc   = self.cc;
+    var ccInfo = cc[cc.length - 1];
+    var state  = ccInfo.state;
 
     if (state === ERROR) {
       return false
     }
 
-    var key  = match[1]
-    var expr = self._normalize(key, match[2])
+    var key  = match[1];
+    var expr = self._normalize(key, match[2]);
 
     switch (key) {
       // Conditional blocks -- `#if-ifset-ifnset` pushes the state and `#endif` pop it
@@ -127,33 +127,33 @@ Parser.prototype = {
       case 'ifset':
       case 'ifnset':
         if (state !== ENDING) {
-          state = self._getValue(key, expr) ? WORKING : TESTING
+          state = self._getValue(key, expr) ? WORKING : TESTING;
         }
-        ccInfo = { state: state, block: IF }
-        cc.push(ccInfo)
+        ccInfo = { state: state, block: IF };
+        cc.push(ccInfo);
         break
 
       case 'elif':
         if (_checkBlock(IF)) {
           if (state === TESTING && self._getValue('if', expr)) {
-            ccInfo.state = WORKING
+            ccInfo.state = WORKING;
           } else if (state === WORKING) {
-            ccInfo.state = ENDING
+            ccInfo.state = ENDING;
           }
         }
         break
 
       case 'else':
         if (_checkBlock(IF)) {
-          ccInfo.block = ELSE
-          ccInfo.state = state === TESTING ? WORKING : ENDING
+          ccInfo.block = ELSE;
+          ccInfo.state = state === TESTING ? WORKING : ENDING;
         }
         break
 
       case 'endif':
         if (_checkBlock(IF | ELSE)) {
-          cc.pop()
-          ccInfo = cc[cc.length - 1]
+          cc.pop();
+          ccInfo = cc[cc.length - 1];
         }
         break
 
@@ -162,13 +162,13 @@ Parser.prototype = {
         if (state === WORKING) {
           switch (key) {
             case 'set':
-              self._set(expr)
+              self._set(expr);
               break
             case 'unset':
-              self._unset(expr)
+              self._unset(expr);
               break
             case 'error':
-              self._error(expr)
+              self._error(expr);
               //_error throws
           }
         }
@@ -179,12 +179,12 @@ Parser.prototype = {
 
     // Inner helper - throws if the current block is not of the expected type
     function _checkBlock (mask) {
-      var block = ccInfo.block
+      var block = ccInfo.block;
 
       if (block !== NONE && block === (block & mask)) {
         return true
       }
-      self._emitError(("Unexpected #" + key))
+      self._emitError(("Unexpected #" + key));
       return false
     }
   },
@@ -195,14 +195,14 @@ Parser.prototype = {
    * @returns {boolean} `true` if no error.
    */
   close: function close () {
-    var cc  = this.cc
-    var len = cc.length
-    var err = len !== 1 || cc[0].state !== WORKING
+    var cc  = this.cc;
+    var len = cc.length;
+    var err = len !== 1 || cc[0].state !== WORKING;
 
     if (err && cc[0].state !== ERROR) {
-      this._emitError('Unexpected end of file')
+      this._emitError('Unexpected end of file');
     }
-    this.options = false
+    this.options = false;
     return !err
   },
 
@@ -214,7 +214,7 @@ Parser.prototype = {
   getRegex: function getRegex () {
     var list = this.options.prefixes
                 .map(function (s) { return s.replace(R_ESCAPED, '\\'); })
-                .join('|')
+                .join('|');
 
     return RegExp(S_RE_BASE.replace('@', list), 'gm')
   },
@@ -226,13 +226,13 @@ Parser.prototype = {
    * @param {string} message - Error description
    */
   _emitError: function _emitError (message) {
-    var errFn = this.options.errorHandler
+    var errFn = this.options.errorHandler;
 
     //message = `jspp [${this.cc.fname || 'input'}] : ${message}`
-    this.cc[this.cc.length - 1].state = this.cc[0].state = ERROR
+    this.cc[this.cc.length - 1].state = this.cc[0].state = ERROR;
 
     if (typeof errFn == 'function') {
-      errFn(message)
+      errFn(message);
     } else {
       throw new Error(message)
     }
@@ -254,13 +254,13 @@ Parser.prototype = {
     }
     // ...other keywords must have an expression
     if (!expr) {
-      this._emitError(("Expression expected for #" + ckey))
+      this._emitError(("Expression expected for #" + ckey));
     }
-    var match
-    R_LASTCMT.lastIndex = 0
+    var match;
+    R_LASTCMT.lastIndex = 0;
     while ((match = R_LASTCMT.exec(expr))) {
       if (match[1]) {
-        expr = expr.slice(0, match.index)
+        expr = expr.slice(0, match.index);
         break
       }
     }
@@ -276,7 +276,7 @@ Parser.prototype = {
    */
   _getValue: function _getValue (ckey, expr) {
     if (ckey !== 'if') {
-      var yes = expr in this.options.values ? 1 : 0
+      var yes = expr in this.options.values ? 1 : 0;
 
       return ckey === 'ifnset' ? yes ^ 1 : yes
     }
@@ -285,36 +285,36 @@ Parser.prototype = {
   },
 
   _set: function _set (s) {
-    var m = s.match(VARPAIR)
+    var m = s.match(VARPAIR);
     if (m) {
-      var k = m[1]
-      var v = m[2]
+      var k = m[1];
+      var v = m[2];
 
-      this.options.values[k] = v ? evalExpr(this, v.trim()) : undefined
+      this.options.values[k] = v ? evalExpr(this, v.trim()) : undefined;
     } else {
-      this._emitError(("Invalid memvar assignment \"" + s + "\""))
+      this._emitError(("Invalid memvar assignment \"" + s + "\""));
     }
   },
 
   _unset: function _unset (s) {
-    var def = s.match(VARNAME)
+    var def = s.match(VARNAME);
     if (def) {
-      delete this.options.values[s]
+      delete this.options.values[s];
     } else {
-      this._emitError(("Invalid memvar name \"" + s + "\""))
+      this._emitError(("Invalid memvar name \"" + s + "\""));
     }
   },
 
   _error: function _error (s) {
-    s = evalExpr(this, s)
+    s = evalExpr(this, s);
     throw new Error(s)
   }
-}
+};
 
 function checkOptions (opts) {
-  if (!opts) { opts = {} }
+  if (!opts) { opts = {}; }
 
-  var values = opts.values || (opts.values = {})
+  var values = opts.values || (opts.values = {});
 
   if (typeof opts.values != 'object') {
     throw new Error('jscc values must be a plain object')
@@ -322,32 +322,32 @@ function checkOptions (opts) {
 
   // set _VERSION once in the options
   if (values._VERSION == null) {
-    var path$$1 = process.cwd().replace(/\\/g, '/')
-    var pack, version = '?'
+    var path$$1 = process.cwd().replace(/\\/g, '/');
+    var pack, version = '?';
 
     while (~path$$1.indexOf('/')) {
-      pack = path.join(path$$1, 'package.json')
+      pack = path.join(path$$1, 'package.json');
       try {
-        version = require(pack).version
+        version = require(pack).version;
         break
       } catch (_) {/**/}
-      path$$1 = path$$1.replace(/\/[^/]*$/, '')
+      path$$1 = path$$1.replace(/\/[^/]*$/, '');
     }
-    values._VERSION = version
+    values._VERSION = version;
   }
 
   Object.keys(opts.values).forEach(function (v) {
     if (!VARNAME.test(v)) {
       throw new Error(("Invalid memvar name: " + v))
     }
-  })
+  });
 
   // sequence starting a directive
-  var prefixes = opts.prefixes
+  var prefixes = opts.prefixes;
   if (!prefixes) {
-    opts.prefixes = ['//', '/*', '<!--']
+    opts.prefixes = ['//', '/*', '<!--'];
   } else if (typeof prefixes == 'string') {
-    opts.prefixes = [prefixes]
+    opts.prefixes = [prefixes];
   } else if (!Array.isArray(prefixes)) {
     throw new Error('`prefixes` must be an array')
   }
@@ -357,22 +357,24 @@ function checkOptions (opts) {
 
 function parseOptions (file, opts) {
 
-  opts = checkOptions(opts)
+  opts = checkOptions(opts);
 
   // shallow copy of the values, must be set per file
-  var values = {}
-  var source = opts.values
+  var values = {};
+  var source = opts.values;
 
-  Object.keys(source).forEach(function (v) { values[v] = source[v] })
+  Object.keys(source).forEach(function (v) { values[v] = source[v]; });
 
   // file is readonly and valid only for this instance
   Object.defineProperty(values, '_FILE', {
     value: file && path.relative(process.cwd(), file).replace(/\\/g, '/') || '',
     enumerable: true
-  })
+  });
 
   return {
     sourceMap:    opts.sourceMap !== false,
+    mapContent:   opts.mapContent,
+    mapHires:     opts.mapHires,
     keepLines:    opts.keepLines,
     errorHandler: opts.errorHandler,
     prefixes:     opts.prefixes,
@@ -382,29 +384,32 @@ function parseOptions (file, opts) {
 
 // for matching all vars inside code
 function remapVars (magicStr, values, str, start) {
-  var re = REPVARS
-  var mm
-  var changes = false
+  var re = REPVARS;
+  var mm;
+  var changes = false;
 
-  re.lastIndex = 0  // `re` is global, so reset
+  re.lastIndex = 0;  // `re` is global, so reset
+
+  // $1 = varname including the prefix '$'
+  // $2 = optional point + property name
 
   while ((mm = re.exec(str))) {
-    var v = mm[1].slice(1)
+    var v = mm[1].slice(1);
 
     if (v in values) {
-      var p   = mm[2] && mm[2].slice(1)
-      var idx = start + mm.index
+      var p   = mm[2] && mm[2].slice(1);
+      var idx = start + mm.index;
 
-      v = values[v]
+      v = values[v];
       if (p && p in v) {
-        v = v[p]
-        mm[1] += mm[2]
+        v = v[p];
+        mm[1] = mm[0];
       } else if (typeof v == 'object') {
-        v = JSON.stringify(v)
+        v = JSON.stringify(v);
       }
 
-      magicStr.overwrite(idx, idx + mm[1].length, String(v))
-      changes = true
+      magicStr.overwrite(idx, idx + mm[1].length, String(v));
+      changes = true;
     }
   }
 
@@ -417,107 +422,103 @@ function remapVars (magicStr, values, str, start) {
  */
 function preproc (code, filename, options) {
 
-  options = parseOptions(filename, options)
+  options = parseOptions(filename, options);
 
-  var magicStr  = new MagicString(code)
-  var parser    = new Parser(options)
+  var magicStr  = new MagicString(code);
+  var parser    = new Parser(options);
 
-  var re = parser.getRegex()  // $1:keyword, $2:expression
+  var re = parser.getRegex();  // $1:keyword, $2:expression
 
-  var changes   = false
-  var output    = true
-  var realStart = 0
-  var hideStart = 0
-  var lastIndex = 0
-  var match, index
+  var changes   = false;
+  var output    = true;
+  var hideStart = 0;
+  var lastIndex = 0;
+  var match, index;
 
-  re.lastIndex = 0
+  re.lastIndex = 0;
 
   while ((match = re.exec(code))) {
 
-    index = match.index
+    index = match.index;
 
-    if (output && lastIndex < index) {
-      pushCache(code.slice(lastIndex, index), lastIndex)
+    if (output && lastIndex < index &&
+        pushCache(code.slice(lastIndex, index), lastIndex)) {
+      changes = true;
     }
 
-    lastIndex = re.lastIndex
+    lastIndex = re.lastIndex;
 
     if (output === parser.parse(match)) {
       if (output) {
-        lastIndex = removeBlock(index, lastIndex)
+        lastIndex = removeBlock(index, lastIndex);
+        changes = true;
       }
+    } else if (output) {
+      // output ends, for now, all we do is to save
+      // the pos where the hidden block begins
+      hideStart = index;
+      output = false;
     } else {
-      output = !output
-      if (output) {
-        // output begins, remove the hidden block now
-        lastIndex = removeBlock(hideStart, lastIndex)
-      } else {
-        // output ends, for now, all we do is to save
-        // the pos where the hidden block begins
-        hideStart = index
-      }
+      // output begins, remove the hidden block now
+      lastIndex = removeBlock(hideStart, lastIndex);
+      output = changes = true;
     }
 
   }
 
   if (!parser.close()) {  // let parser to detect unbalanced blocks
-    output = false
+    output = false;
   }
 
-  if (output && code.length > lastIndex) {
-    pushCache(code.slice(lastIndex), lastIndex)
+  if (output && code.length > lastIndex &&
+      pushCache(code.slice(lastIndex), lastIndex)) {
+    changes = true;
   }
 
-  // done, return an object if there was changes
-  if (changes) {
-    var result = {
-      code: magicStr.toString()
-    }
-    if (changes && options.sourceMap) {
-      var name = options.values._FILE
-
-      result.map = magicStr.generateMap({
-        source: name,
-        file: name.split(/[\\/]/).pop(),
-        hires: true
-      })
-    }
-    return result
+  // always returns an object
+  var result = {
+    code: changes ? magicStr.toString() : code
+  };
+
+  if (changes && options.sourceMap) {
+    var name = filename || null;
+
+    result.map = magicStr.generateMap({
+      source: name,
+      file: name && ((name.split(/[\\/]/).pop()) + ".map"),
+      includeContent: options.mapContent !== false,
+      hires: options.mapHires !== false
+    });
   }
 
-  return code
+  return result
 
   // helpers ==============================================
 
   function pushCache (str, start) {
-    if (str && ~str.indexOf('$_')) {
-      changes = remapVars(magicStr, options.values, str, start) || changes
+    var change = str && ~str.indexOf('$_');
+
+    if (change) {
+      change = remapVars(magicStr, options.values, str, start);
     }
+
+    return change
   }
 
   function removeBlock (start, end) {
-    var block = ''
+    var block = '';
 
     if (options.keepLines) {
-      block = code.slice(start, end).replace(/[^\r\n]+/g, '')
+      block = code.slice(start, end).replace(/[^\r\n]+/g, '');
 
-    // @TODO: Remove first jscc lines
-    } else if (start > realStart) {
-      --start
-      if (code[start] === '\n' && code[start - 1] === '\r') {
-        --start
-      }
-    } else if (end < code.length && /[\n\r]/.test(code[end])) {
-      ++end
+    } else if (end < code.length) {
+      ++end;
       if (code[end] === '\n' && code[end - 1] === '\r') {
-        ++end
+        ++end;
       }
-      realStart = end
     }
-    magicStr.overwrite(start, end, block)
-    changes = true
 
+    magicStr.overwrite(start, end, block);
     return end
   }
 }
diff --git a/package.json b/package.json
index d1f4b3b..82c9107 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jscc",
-  "version": "0.3.1",
+  "version": "0.3.2",
   "description": "The JavaScript preprocessor for conditional comments and replacements in text files",
   "main": "./lib/jscc.js",
   "module": "./lib/jscc.es.js",
@@ -39,7 +39,8 @@
     "comments",
     "compilation",
     "preprocessor",
-    "replacement"
+    "replacement",
+    "jspreproc"
   ],
   "author": {
     "name": "aMarCruz",
@@ -53,12 +54,12 @@
   },
   "devDependencies": {
     "buble": "^0.14.0",
-    "eslint": "^3.7.1",
+    "eslint": "^3.8.1",
     "expect": "^1.20.2",
     "istanbul": "^0.4.5",
-    "mocha": "^3.1.0",
+    "mocha": "^3.1.2",
     "node-version-check": "^2.1.1",
-    "rollup": "^0.36.1",
+    "rollup": "^0.36.3",
     "rollup-plugin-buble": "^0.14.0"
   }
 }
diff --git a/src/parse-options.js b/src/parse-options.js
index 72407b0..b0f82b1 100644
--- a/src/parse-options.js
+++ b/src/parse-options.js
@@ -19,6 +19,8 @@ export default function parseOptions (file, opts) {
 
   return {
     sourceMap:    opts.sourceMap !== false,
+    mapContent:   opts.mapContent,
+    mapHires:     opts.mapHires,
     keepLines:    opts.keepLines,
     errorHandler: opts.errorHandler,
     prefixes:     opts.prefixes,
diff --git a/src/preproc.js b/src/preproc.js
index 3bf2c16..806411c 100644
--- a/src/preproc.js
+++ b/src/preproc.js
@@ -19,7 +19,6 @@ export default function preproc (code, filename, options) {
 
   let changes   = false
   let output    = true
-  let realStart = 0
   let hideStart = 0
   let lastIndex = 0
   let match, index
@@ -30,8 +29,9 @@ export default function preproc (code, filename, options) {
 
     index = match.index
 
-    if (output && lastIndex < index) {
-      pushCache(code.slice(lastIndex, index), lastIndex)
+    if (output && lastIndex < index &&
+        pushCache(code.slice(lastIndex, index), lastIndex)) {
+      changes = true
     }
 
     lastIndex = re.lastIndex
@@ -39,17 +39,17 @@ export default function preproc (code, filename, options) {
     if (output === parser.parse(match)) {
       if (output) {
         lastIndex = removeBlock(index, lastIndex)
+        changes = true
       }
+    } else if (output) {
+      // output ends, for now, all we do is to save
+      // the pos where the hidden block begins
+      hideStart = index
+      output = false
     } else {
-      output = !output
-      if (output) {
-        // output begins, remove the hidden block now
-        lastIndex = removeBlock(hideStart, lastIndex)
-      } else {
-        // output ends, for now, all we do is to save
-        // the pos where the hidden block begins
-        hideStart = index
-      }
+      // output begins, remove the hidden block now
+      lastIndex = removeBlock(hideStart, lastIndex)
+      output = changes = true
     }
 
   }
@@ -58,35 +58,39 @@ export default function preproc (code, filename, options) {
     output = false
   }
 
-  if (output && code.length > lastIndex) {
-    pushCache(code.slice(lastIndex), lastIndex)
+  if (output && code.length > lastIndex &&
+      pushCache(code.slice(lastIndex), lastIndex)) {
+    changes = true
   }
 
-  // done, return an object if there was changes
-  if (changes) {
-    const result = {
-      code: magicStr.toString()
-    }
-    if (changes && options.sourceMap) {
-      const name = options.values._FILE
-
-      result.map = magicStr.generateMap({
-        source: name,
-        file: name.split(/[\\/]/).pop(),
-        hires: true
-      })
-    }
-    return result
+  // always returns an object
+  const result = {
+    code: changes ? magicStr.toString() : code
+  }
+
+  if (changes && options.sourceMap) {
+    const name = filename || null
+
+    result.map = magicStr.generateMap({
+      source: name,
+      file: name && `${name.split(/[\\/]/).pop()}.map`,
+      includeContent: options.mapContent !== false,
+      hires: options.mapHires !== false
+    })
   }
 
-  return code
+  return result
 
   // helpers ==============================================
 
   function pushCache (str, start) {
-    if (str && ~str.indexOf('$_')) {
-      changes = remapVars(magicStr, options.values, str, start) || changes
+    let change = str && ~str.indexOf('$_')
+
+    if (change) {
+      change = remapVars(magicStr, options.values, str, start)
     }
+
+    return change
   }
 
   function removeBlock (start, end) {
@@ -95,22 +99,14 @@ export default function preproc (code, filename, options) {
     if (options.keepLines) {
       block = code.slice(start, end).replace(/[^\r\n]+/g, '')
 
-    // @TODO: Remove first jscc lines
-    } else if (start > realStart) {
-      --start
-      if (code[start] === '\n' && code[start - 1] === '\r') {
-        --start
-      }
-    } else if (end < code.length && /[\n\r]/.test(code[end])) {
+    } else if (end < code.length) {
       ++end
       if (code[end] === '\n' && code[end - 1] === '\r') {
         ++end
       }
-      realStart = end
     }
-    magicStr.overwrite(start, end, block)
-    changes = true
 
+    magicStr.overwrite(start, end, block)
     return end
   }
 }
diff --git a/src/remap-vars.js b/src/remap-vars.js
index f8f7cf1..ad251a6 100644
--- a/src/remap-vars.js
+++ b/src/remap-vars.js
@@ -9,6 +9,9 @@ export default function remapVars (magicStr, values, str, start) {
 
   re.lastIndex = 0  // `re` is global, so reset
 
+  // $1 = varname including the prefix '$'
+  // $2 = optional point + property name
+
   while ((mm = re.exec(str))) {
     let v = mm[1].slice(1)
 
@@ -19,7 +22,7 @@ export default function remapVars (magicStr, values, str, start) {
       v = values[v]
       if (p && p in v) {
         v = v[p]
-        mm[1] += mm[2]
+        mm[1] = mm[0]
       } else if (typeof v == 'object') {
         v = JSON.stringify(v)
       }
diff --git a/test/.eslintrc.yml b/test/.eslintrc.yml
index d4e610f..f08742d 100644
--- a/test/.eslintrc.yml
+++ b/test/.eslintrc.yml
@@ -4,4 +4,5 @@ env:
 
 rules:
   no-console: 0
+  no-debugger: 0
   prefer-template: 0
diff --git a/test/index.js b/test/index.js
index 5e2cf0a..e9ebf7e 100644
--- a/test/index.js
+++ b/test/index.js
@@ -168,6 +168,13 @@ describe('Compile-time variables', function () {
     testFile('var-macros')
   })
 
+  it('must recognize memvar with no line-ending', function () {
+    var result = preprocStr('$_TRUE', {
+      values: { _TRUE: true }
+    })
+    expect(result).toBe('true')
+  })
+
   it('non defined vars in directives defaults to those in `global`', function () {
     global._GLOBAL = true
     testStr('var-eval-in-global', 'true')