diff --git a/.appveyor.yml b/.appveyor.yml
new file mode 100644
index 0000000..971a7a5
--- /dev/null
+++ b/.appveyor.yml
@@ -0,0 +1,18 @@
+version: "{build} - {branch}"
+skip_tags: true
+skip_branch_with_pr: true
+
+environment:
+  matrix:
+    - nodejs_version: "8"
+    - nodejs_version: "7"
+    - nodejs_version: "6"
+
+install:
+  - ps: Install-Product node $env:nodejs_version
+  - npm install
+
+test_script:
+  - npm test
+
+build: off
diff --git a/.npmrc b/.npmrc
index 9cf9495..43c97e7 100644
--- a/.npmrc
+++ b/.npmrc
@@ -1 +1 @@
-package-lock=false
\ No newline at end of file
+package-lock=false
diff --git a/.travis.yml b/.travis.yml
index 7bd9f66..44926fa 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,25 +1,41 @@
 language: node_js
 
-cache:
-  directories:
-    - node_modules
+stages:
+  - name: test
+    if: tag IS blank
+  - name: deploy
+    if: branch = master
 
 notifications:
   email: false
 
-node_js:
-  - '8'
-  - '6'
+env:
+  - BUILD_LEADER_ID=5
 
-before_script:
-  - npm prune
-
-after_success:
-  - npm install coveralls@^2.11.9 && cat ./coverage/lcov.info | coveralls
-  - npm i
-  - npm run build
-  - npm run semantic-release
-
-branches:
-  except:
-    - /^v\d+\.\d+\.\d+$/
+jobs:
+  include:
+    - stage: test
+      node_js: '8'
+      after_success:
+        - npm install coveralls@^2.11.9 && cat ./coverage/lcov.info | coveralls
+    - stage: test
+      node_js: '7'
+      after_success:
+        - npm install coveralls@^2.11.9 && cat ./coverage/lcov.info | coveralls
+    - stage: test
+      node_js: '6'
+      after_success:
+        - npm install coveralls@^2.11.9 && cat ./coverage/lcov.info | coveralls
+    - stage: deploy
+      node_js: '8'
+      script: npm run typedoc
+      deploy:
+        provider: pages
+        skip_cleanup: true
+        github_token: $GH_TOKEN
+        local_dir: ./docs
+    - stage: deploy
+      node_js: '8'
+      before_script: npm run build
+      script: echo "Deploy with semantic release"
+      after_success: npm run semantic-release
diff --git a/CHANGELOG.md b/CHANGELOG.md
deleted file mode 100644
index 6d9ea93..0000000
--- a/CHANGELOG.md
+++ /dev/null
@@ -1,20 +0,0 @@
-# Change Log
-All notable changes to this project will be documented in this file.
-This project adheres to [Semantic Versioning](http://semver.org/).
-
-## [Unreleased]
-### Changed
-- Update node to v6/v8 and upgrade modules
-
-
-## [v0.4.0]
-### Added
-- Changelog
-
-### Changed
-- Updated dependencies
-- Breaking: update loader to new interface of `proc-that`
-
-
-[Unreleased]: https://github.com/smartive/proc-that-elastic-loader/compare/v0.4.0...master
-[v0.4.0]: https://github.com/smartive/proc-that-elastic-loader/compare/v0.3.2...v0.4.0
diff --git a/README.md b/README.md
index 5b058d4..d0ad015 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,16 @@
 # ElasticLoader
+
 Loader for `proc-that`. Loads processed items into an elasticsearch index.
 
 ##### A bunch of badges
 
-[![Build Status](https://travis-ci.org/smartive/proc-that-elastic-loader.svg?maxAge=3600)](https://travis-ci.org/smartive/proc-that-elastic-loader) [![npm](https://img.shields.io/npm/v/proc-that-elastic-loader.svg?maxAge=3600)](https://www.npmjs.com/package/proc-that-elastic-loader) [![Coverage status](https://img.shields.io/coveralls/smartive/proc-that-elastic-loader.svg?maxAge=3600)](https://coveralls.io/github/smartive/proc-that-elastic-loader) [![license](https://img.shields.io/github/license/smartive/proc-that-elastic-loader.svg?maxAge=2592000)](https://github.com/smartive/proc-that-elastic-loader)
+[![Build Status](https://travis-ci.org/smartive/proc-that-elastic-loader.svg?maxAge=3600)](https://travis-ci.org/smartive/proc-that-elastic-loader)
+[![Build Status](https://ci.appveyor.com/api/projects/status/382q34ka9its372v?svg=true)](https://ci.appveyor.com/project/buehler/proc-that-elastic-loader)
+[![npm](https://img.shields.io/npm/v/proc-that-elastic-loader.svg?maxAge=3600)](https://www.npmjs.com/package/proc-that-elastic-loader)
+[![Coverage status](https://img.shields.io/coveralls/smartive/proc-that-elastic-loader.svg?maxAge=3600)](https://coveralls.io/github/smartive/proc-that-elastic-loader)
+[![license](https://img.shields.io/github/license/smartive/proc-that-elastic-loader.svg?maxAge=2592000)](https://github.com/smartive/proc-that-elastic-loader)
+[![semantic-release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg)](https://github.com/semantic-release/semantic-release)
+[![Greenkeeper badge](https://badges.greenkeeper.io/smartive/proc-that-elastic-loader.svg)](https://greenkeeper.io/)
 
 ## Installation
 
@@ -53,4 +60,4 @@ let type1Loader = new ElasticLoader({/*es-config*/}, 'index', 'type_1', obj => o
 let type2Loader = new ElasticLoader({/*es-config*/}, 'index', 'type_2', obj => obj.type === 'Type2');
 
 new Etl().addLoader(type1Loader).addLoader(type2Loader).start().subscribe(/*...*/);
-```
\ No newline at end of file
+```
diff --git a/package.json b/package.json
index 43758b0..ddf45b6 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,8 @@
     "lint": "tslint -c ./tslint.json -p ./config/tsconfig.build.json",
     "test": "npm run lint && npm run clean && jest -c ./jest.json",
     "test:watch": "npm run clean && jest -c ./jest.json --watch",
-    "semantic-release": "semantic-release pre && npm publish && semantic-release post"
+    "typedoc": "del-cli ./docs && typedoc --ignoreCompilerErrors --out ./docs --mode file --tsconfig ./config/tsconfig.build.json ./src/",
+    "semantic-release": "semantic-release"
   },
   "keywords": [
     "etl",
@@ -31,21 +32,22 @@
   "author": "Christoph Bühler <christoph.buehler@bluewin.ch>",
   "license": "MIT",
   "devDependencies": {
-    "@types/jest": "^20.0.5",
+    "@types/jest": "^21.1.5",
     "del-cli": "^1.1.0",
-    "jest": "^20.0.4",
-    "ts-jest": "^20.0.7",
-    "tslint": "^5.5.0",
-    "tslint-config-airbnb": "^5.2.1",
-    "tsutils": "^2.8.0",
-    "typescript": "^2.4.2",
-    "semantic-release": "^6.3.6"
+    "jest": "^21.2.1",
+    "semantic-release": "^9.0.0",
+    "ts-jest": "^21.1.4",
+    "tslint": "^5.8.0",
+    "tslint-config-airbnb": "^5.3.0",
+    "tsutils": "^2.12.2",
+    "typedoc": "^0.9.0",
+    "typescript": "^2.6.1"
   },
   "dependencies": {
-    "elasticsearch": "^13.2.0",
-    "proc-that": "^0.4.0",
-    "@types/node": "^8.0.17",
-    "rxjs": "^5.4.2",
-    "tslib": "^1.7.1"
+    "elasticsearch": "^13.3.1",
+    "proc-that": "^1.0.1",
+    "@types/node": "^8.0.47",
+    "rxjs": "^5.5.2",
+    "tslib": "^1.8.0"
   }
 }
diff --git a/tslint.json b/tslint.json
index f26a210..1ccf077 100644
--- a/tslint.json
+++ b/tslint.json
@@ -26,6 +26,8 @@
                 ]
             }
         ],
+        "no-boolean-literal-compare": false,
+        "strict-boolean-expressions": false,
         "no-increment-decrement": false,
         "no-trailing-whitespace": [
             true,