diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..d5f19d8
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+node_modules
+package-lock.json
diff --git a/.travis.yml b/.travis.yml
index 48c2386..c3f81b2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,9 @@ node_js:
   - "7"
   - "6"
 sudo: enabled
-install: true  # disable install
+script:
+  - npm test
+  - npm run lint
 notifications:
   email:
     recipients:
diff --git a/package.json b/package.json
index b8cba3d..a93777c 100644
--- a/package.json
+++ b/package.json
@@ -3,15 +3,16 @@
   "version": "1.0.0",
   "description": "Practice touch typing in the commandline and measure your skills",
   "main": "app.js",
-  "engineStrict" : true,
-  "engines" : {
-    "node" : ">=6.4.0"
+  "engineStrict": true,
+  "engines": {
+    "node": ">=6.4.0"
   },
   "scripts": {
-    "test": "node app.js -d -t 1"
+    "test": "node app.js -d -t 1",
+    "lint": "./node_modules/.bin/eslint . ./**/*.js"
   },
   "bin": {
-      "cli-typer": "./app.js"
+    "cli-typer": "./app.js"
   },
   "repository": {
     "type": "git",
@@ -22,25 +23,28 @@
     "touch-type"
   ],
   "author": {
-      "name" : "Balazs Saros",
-      "email" : "balazs.saros@gmail.com",
-      "url" : "https://github.com/balzss"
+    "name": "Balazs Saros",
+    "email": "balazs.saros@gmail.com",
+    "url": "https://github.com/balzss"
   },
   "contributors": [
-      {
-          "name" : "Mice Papai",
-          "email" : "qwhexz@gmail.com",
-          "url" : "https://qwhex.com"
-      },
-      {
-          "name" : "Brady Mitchell",
-          "email" : "bradym@users.noreply.github.com",
-          "url" : "https://github.com/bradym"
-      }
+    {
+      "name": "Mice Papai",
+      "email": "qwhexz@gmail.com",
+      "url": "https://qwhex.com"
+    },
+    {
+      "name": "Brady Mitchell",
+      "email": "bradym@users.noreply.github.com",
+      "url": "https://github.com/bradym"
+    }
   ],
   "license": "GPL-3.0",
   "bugs": {
     "url": "https://github.com/balzss/cli-typer/issues"
   },
-  "homepage": "https://github.com/balzss/cli-typer#readme"
+  "homepage": "https://github.com/balzss/cli-typer#readme",
+  "devDependencies": {
+    "eslint": "^4.19.1"
+  }
 }