diff --git a/bin/json2csv.js b/bin/json2csv.js
index c3d55b20..4de2c863 100755
--- a/bin/json2csv.js
+++ b/bin/json2csv.js
@@ -68,6 +68,16 @@ function getFields() {
       : undefined;
 }
 
+function getInputStream() {
+  if (!inputPath) {
+    process.stdin.resume();
+    process.stdin.setEncoding('utf8');
+    return process.stdin;
+  }
+
+  return fs.createReadStream(inputPath, { encoding: 'utf8' })
+}
+
 function getInput() {
   if (!inputPath) {
     return getInputFromStdin();
@@ -157,14 +167,14 @@ Promise.resolve()
       withBOM: program.withBom
     };
 
-    if (!inputPath || program.streaming === false) {
+    if (!program.streaming) {
       return getInput()
         .then(input => new JSON2CSVParser(opts).parse(input))
         .then(processOutput);
     }
 
     const transform = new Json2csvTransform(opts);
-    const input = fs.createReadStream(inputPath, { encoding: 'utf8' });
+    const input = getInputStream();
     const stream = input.pipe(transform);
     
     if (program.output) {
diff --git a/lib/JSON2CSVTransform.js b/lib/JSON2CSVTransform.js
index ec863cc0..3a506860 100644
--- a/lib/JSON2CSVTransform.js
+++ b/lib/JSON2CSVTransform.js
@@ -50,18 +50,26 @@ class JSON2CSVTransform extends Transform {
           .map(line => line.trim())
           .filter(line => line !== '');
 
+        let pendingData = false;
         lines
           .forEach((line, i) => {
             try {
               transform.pushLine(JSON.parse(line));
             } catch(e) {
-              if (i !== lines.length - 1) {
+              if (i === lines.length - 1) {
+                pendingData = true;
+              } else {
                 e.message = 'Invalid JSON (' + line + ')'
                 transform.emit('error', e);
               }
             }
           });
-        this._data = this._data.slice(this._data.lastIndexOf('\n'));
+        this._data = pendingData
+          ? this._data.slice(this._data.lastIndexOf('\n'))
+          : '';
+      },
+      getPendingData() {
+        return this._data;
       }
     };
   }
@@ -104,6 +112,10 @@ class JSON2CSVTransform extends Transform {
       }
     }
 
+    this.parser.getPendingData = function () {
+      return this.value;
+    }
+
     this.parser.onError = function (err) {
       if(err.message.indexOf('Unexpected') > -1) {
         err.message = 'Invalid JSON (' + err.message + ')';
@@ -124,6 +136,15 @@ class JSON2CSVTransform extends Transform {
     done();
   }
 
+  _flush(done) {
+    if (this.parser.getPendingData()) {
+      done(new Error('Invalid data received from stdin', this.parser.getPendingData()));
+    }
+
+    done();
+  }
+
+
   /**
    * Generate the csv header and pushes it downstream.
    */
diff --git a/test/CLI.js b/test/CLI.js
index 4321efbf..8861f6de 100644
--- a/test/CLI.js
+++ b/test/CLI.js
@@ -626,11 +626,11 @@ module.exports = (testRunner, jsonFixtures, csvFixtures) => {
 
   // Get input from stdin
 
-  testRunner.add('should get input from stdin', (t) => {
+  testRunner.add('should get input from stdin and process as stream', (t) => {
     const test = child_process.exec(cli, (err, stdout, stderr) => {
       t.notOk(stderr); 
       const csv = stdout;
-      t.equal(csv, csvFixtures.default + '\n'); // console.log append the new line
+      t.equal(csv, csvFixtures.defaultStream);
       t.end();
     });
 
@@ -648,6 +648,28 @@ module.exports = (testRunner, jsonFixtures, csvFixtures) => {
     test.stdin.end();
   });
 
+  testRunner.add('should get input from stdin with -s flag', (t) => {
+    const test = child_process.exec(cli + '-s', (err, stdout, stderr) => {
+      t.notOk(stderr); 
+      const csv = stdout;
+      t.equal(csv, csvFixtures.default + '\n'); // console.log append the new line
+      t.end();
+    });
+
+    test.stdin.write(JSON.stringify(jsonFixtures.default));
+    test.stdin.end();
+  });
+
+  testRunner.add('should error if stdin data is not valid with -s flag', (t) => {
+    const test = child_process.exec(cli + '-s', (err, stdout, stderr) => {
+      t.ok(stderr.indexOf('Invalid data received from stdin') !== -1);
+      t.end();
+    });
+
+    test.stdin.write('{ "b": 1,');
+    test.stdin.end();
+  });
+
   // testRunner.add('should error if stdin fails', (t) => {
   //   const test = child_process.exec(cli, (err, stdout, stderr) => {
   //     t.ok(stderr.indexOf('Could not read from stdin') !== -1);
diff --git a/test/JSON2CSVTransform.js b/test/JSON2CSVTransform.js
index 5cd33279..1b90296f 100644
--- a/test/JSON2CSVTransform.js
+++ b/test/JSON2CSVTransform.js
@@ -151,21 +151,20 @@ module.exports = (testRunner, jsonFixtures, csvFixtures) => {
       .on('error', err => t.notOk(true, err.message));
   });
 
-  // TODO infer only from first element
-  // testRunner.add('should parse json to csv and infer the fields automatically ', (t) => {
-  //   const transform = new Json2csvTransform();
-  //   const processor = jsonFixtures.default().pipe(transform);
-
-  //   let csv = '';
-  //   processor
-  //     .on('data', chunk => (csv += chunk.toString()))
-  //     .on('end', () => {
-  //       t.ok(typeof csv === 'string');
-  //       t.equal(csv, csvFixtures.default);
-  //       t.end();
-  //     })
-  //     .on('error', err => t.notOk(true, err.message));
-  // });
+  testRunner.add('should parse json to csv and infer the fields automatically ', (t) => {
+    const transform = new Json2csvTransform();
+    const processor = jsonFixtures.default().pipe(transform);
+
+    let csv = '';
+    processor
+      .on('data', chunk => (csv += chunk.toString()))
+      .on('end', () => {
+        t.ok(typeof csv === 'string');
+        t.equal(csv, csvFixtures.defaultStream);
+        t.end();
+      })
+      .on('error', err => t.notOk(true, err.message));
+  });
 
   testRunner.add('should parse json to csv using custom fields', (t) => {
     const opts = {
diff --git a/test/fixtures/csv/defaultStream.csv b/test/fixtures/csv/defaultStream.csv
new file mode 100644
index 00000000..bf2246de
--- /dev/null
+++ b/test/fixtures/csv/defaultStream.csv
@@ -0,0 +1,5 @@
+"carModel","price","color"
+"Audi",0,"blue"
+"BMW",15000,"red"
+"Mercedes",20000,"yellow"
+"Porsche",30000,"green"
\ No newline at end of file