diff --git a/regexp-lexer.js b/regexp-lexer.js
index cc68c65..fba6e4b 100644
--- a/regexp-lexer.js
+++ b/regexp-lexer.js
@@ -39,6 +39,12 @@ function prepareRules(rules, macros, actions, tokens, startConditions, caseless)
             // Add to explicit start conditions
             conditions = rules[i].shift();
             for (k=0;k<conditions.length;k++) {
+                if (!startConditions.hasOwnProperty(conditions[k])) {
+                    startConditions[conditions[k]] = {
+                        rules: [], inclusive: false
+                    };
+                    console.warn('Lexer Warning : "' + conditions[k] + '" start condition should be defined as %s or %x');
+                }
                 startConditions[conditions[k]].rules.push(i);
             }
         }
@@ -170,6 +176,15 @@ RegExpLexer.prototype = {
     // consumes and returns one char from the input
     input: function () {
         var ch = this._input[0];
+        if ( ch == '\r' && this._input[1] == '\n' ) {
+            ch += '\n'; 
+            this.yyleng++;
+            this.offset++;
+            this._input = this._input.slice(1);
+            if (this.options.ranges) {
+                this.yylloc.range[1]++;
+            }
+        }
         this.yytext += ch;
         this.yyleng++;
         this.offset++;
diff --git a/tests/regexplexer.js b/tests/regexplexer.js
index 6128c47..f865e26 100644
--- a/tests/regexplexer.js
+++ b/tests/regexplexer.js
@@ -247,7 +247,7 @@ exports["test yytext overwrite"] = function() {
     assert.equal(lexer.yytext, "hi der");
 };
 
-exports["test yylineno"] = function() {
+exports["test yylineno with test_match"] = function() {
     var dict = {
         rules: [
            ["\\s+", "/* skip whitespace */" ],
@@ -257,7 +257,6 @@ exports["test yylineno"] = function() {
     };
 
     var input = "x\nxy\n\n\nx";
-
     var lexer = new RegExpLexer(dict, input);
     assert.equal(lexer.yylineno, 0);
     assert.equal(lexer.lex(), "x");
@@ -269,6 +268,48 @@ exports["test yylineno"] = function() {
     assert.equal(lexer.yylineno, 4);
 };
 
+exports["test yylineno with input"] = function() {
+    var dict = {
+        rules: [
+           ["\\s+", "/* skip whitespace */" ],
+           ["x", "return 'x';" ],
+           ["y", "return 'y';" ]
+       ]
+    };
+
+    // windows style
+    var input = "a\r\nb";
+    var lexer = new RegExpLexer(dict, input);
+    assert.equal(lexer.yylineno, 0);
+    assert.equal(lexer.input(), "a");
+    assert.equal(lexer.input(), "\r\n");
+    assert.equal(lexer.yylineno, 1);
+    assert.equal(lexer.input(), "b");
+    assert.equal(lexer.yylineno, 1);
+
+    // linux style
+    var input = "a\nb";
+    var lexer = new RegExpLexer(dict, input);
+    assert.equal(lexer.yylineno, 0);
+    assert.equal(lexer.input(), "a");
+    assert.equal(lexer.input(), "\n");
+    assert.equal(lexer.yylineno, 1);
+    assert.equal(lexer.input(), "b");
+    assert.equal(lexer.yylineno, 1);
+
+    // mac style
+    var input = "a\rb";
+    var lexer = new RegExpLexer(dict, input);
+    assert.equal(lexer.yylineno, 0);
+    assert.equal(lexer.input(), "a");
+    assert.equal(lexer.input(), "\r");
+    assert.equal(lexer.yylineno, 1);
+    assert.equal(lexer.input(), "b");
+    assert.equal(lexer.yylineno, 1);
+
+};
+
+
 exports["test yylloc"] = function() {
     var dict = {
         rules: [
@@ -718,6 +759,30 @@ exports["test start condition constants"] = function() {
     assert.equal(lexer.lex(), "EOF");
 };
 
+exports["test start condition & warning"] = function() {
+    var dict = {
+        startConditions: {
+            "INITIAL": 0,
+        },
+        rules: [
+            ["\\/\\/", "this.begin('EAT');" ],
+            [["EAT"], ".", "if (YYSTATE==='EAT') return 'E';" ],
+            ["x", "if (YY_START==='INITIAL') return 'X';" ],
+            ["y", "return 'Y';" ],
+            [["*"],"$", "return 'EOF';" ]
+        ]
+    };
+    var input = "xy//y";
+
+    var lexer = new RegExpLexer(dict);
+    lexer.setInput(input);
+
+    assert.equal(lexer.lex(), "X");
+    assert.equal(lexer.lex(), "Y");
+    assert.equal(lexer.lex(), "E");
+    assert.equal(lexer.lex(), "EOF");
+};
+
 exports["test unicode encoding"] = function() {
     var dict = {
         rules: [