diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2096783e..a288c8fb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,7 +9,18 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Added
 ### Fixed
 ### Changed
-### Deprecated-->
+### Deprecated
+### Removed-->
+
+
+## [v0.3.8] - 2019-02-28
+
+### Added
+- OpenFuelService integration ([#248](https://github.com/GIScience/openrouteservice-app/issues/248))
+
+### Removed
+- cycling-tour profile ([#272](https://github.com/GIScience/openrouteservice-app/issues/272))
+- some options see ORS issue [#396](https://github.com/GIScience/openrouteservice/issues/396) ([#274](https://github.com/GIScience/openrouteservice-app/issues/274))
 
 ## [v0.3.7] - 2018-12-17
 
diff --git a/app/components/ors-header/ors-header.js b/app/components/ors-header/ors-header.js
index cda03f31..c5661afe 100755
--- a/app/components/ors-header/ors-header.js
+++ b/app/components/ors-header/ors-header.js
@@ -97,6 +97,7 @@ angular.module("orsApp.ors-header", []).component("orsHeader", {
         ENV.geocode = ctrl.currentOptions.env.geocode;
         ENV.matrix = ctrl.currentOptions.env.matrix;
         ENV.pois = ctrl.currentOptions.env.pois;
+        ENV.fuel = ctrl.currentOptions.env.fuel;
       };
       /**
        * Informs the user about changed Endpoints
@@ -107,7 +108,8 @@ geocode:     ${ENV.geocode}
 directions:   ${ENV.directions}
 isochrones:  ${ENV.isochrones}
 matrix:        ${ENV.matrix}
-pois:            ${ENV.pois}`);
+pois:            ${ENV.pois}
+fuel:            ${ENV.fuel}`);
       };
       /**
        * Save Endpoints to cookies
diff --git a/app/components/ors-map/ors-map.js b/app/components/ors-map/ors-map.js
index b8e730ae..0fefc708 100755
--- a/app/components/ors-map/ors-map.js
+++ b/app/components/ors-map/ors-map.js
@@ -337,11 +337,8 @@ angular.module("orsApp").directive("orsMap", () => {
           orsCookiesFactory.getMapOptions() &&
           orsCookiesFactory.getMapOptions().msi
             ? orsCookiesFactory.getMapOptions().msi
-            : 3;
-        // override cookies if mapsurfer in cookies
-        if ($scope.mapStyleId === 0) {
-          $scope.mapStyleId = 3;
-        }
+            : 0;
+
         // mapOptionsInitSubject is a replay subject and only subscribes once
         let mapInitSubject = orsSettingsFactory.mapOptionsInitSubject.subscribe(
           settings => {
@@ -472,6 +469,7 @@ angular.module("orsApp").directive("orsMap", () => {
           // add mapstyle
           angular.forEach($scope.baseLayers, (value, key) => {
             if (value.options.id == $scope.mapStyleId) {
+              console.log($scope.mapStyleId, $scope.baseLayers);
               $scope.baseLayers[key].addTo($scope.orsMap);
             }
           });
@@ -1969,13 +1967,15 @@ angular.module("orsApp").directive("orsPopup", [
   "orsUtilsService",
   "orsRequestService",
   "orsRouteService",
+  "orsFuelService",
   (
     $compile,
     $timeout,
     orsSettingsFactory,
     orsUtilsService,
     orsRequestService,
-    orsRouteService
+    orsRouteService,
+    orsFuelService
   ) => {
     return {
       restrict: "E",
diff --git a/app/components/ors-navigation/ors-nav.js b/app/components/ors-navigation/ors-nav.js
index ac9f8f25..e2de8d47 100755
--- a/app/components/ors-navigation/ors-nav.js
+++ b/app/components/ors-navigation/ors-nav.js
@@ -13,7 +13,7 @@ angular
         if ($location.path() == "/") {
           ctrl.activeMenu = "/directions";
         } else ctrl.activeMenu = $location.path();
-        ctrl.version = "0.3.7";
+        ctrl.version = "0.3.8";
       }
     ],
     $routeConfig: [
diff --git a/app/components/ors-panel-accessibilityanalysis/ors-aa-waypoints/ors-aa-waypoint/ors-aa-waypoint.js b/app/components/ors-panel-accessibilityanalysis/ors-aa-waypoints/ors-aa-waypoint/ors-aa-waypoint.js
index a8f45163..3174d988 100755
--- a/app/components/ors-panel-accessibilityanalysis/ors-aa-waypoints/ors-aa-waypoint/ors-aa-waypoint.js
+++ b/app/components/ors-panel-accessibilityanalysis/ors-aa-waypoints/ors-aa-waypoint/ors-aa-waypoint.js
@@ -35,13 +35,10 @@ angular.module("orsApp.ors-aa-waypoint", []).component("orsAaWaypoint", {
         ctrl.showGeocodingPanel = !ctrl.showGeocodingPanel;
       };
       // ctrl.$doCheck = () => {
-      //  console.log('check');
       // }
       // ctrl.$onChanges = (changesObj) => {
       //     // can be different kinds of changes
       //     if (changesObj.idx) {
-      //      console.log(changesObj.idx);
-      //      console.log(ctrl.waypoints);
       //      // if array is reversed, 5 changes, how to unify???
       //     }
       // };
diff --git a/app/components/ors-panel-accessibilityanalysis/ors-aa-waypoints/ors-aa-waypoints.js b/app/components/ors-panel-accessibilityanalysis/ors-aa-waypoints/ors-aa-waypoints.js
index 021816bd..1d88c473 100755
--- a/app/components/ors-panel-accessibilityanalysis/ors-aa-waypoints/ors-aa-waypoints.js
+++ b/app/components/ors-panel-accessibilityanalysis/ors-aa-waypoints/ors-aa-waypoints.js
@@ -38,7 +38,6 @@ angular
         };
         // subscribes to changes in waypoints, this doesnt have to be added though, why?
         // orsSettingsFactory.subscribeToAaWaypoints(function onNext(d) {
-        //     console.log('waypoints updated!!! panel', d);
         //     ctrl.waypoints = d;
         // });
         ctrl.collapsed = false;
@@ -71,7 +70,6 @@ angular
         };
         ctrl.$doCheck = () => {
           // check if array has changed
-          //console.log('update route');
         };
         ctrl.waypointsChanged = () => {};
         ctrl.resetWaypoints = () => {
diff --git a/app/components/ors-panel-routing/ors-summary/ors-summary.html b/app/components/ors-panel-routing/ors-summary/ors-summary.html
index 5e681d7c..7ccce60d 100755
--- a/app/components/ors-panel-routing/ors-summary/ors-summary.html
+++ b/app/components/ors-panel-routing/ors-summary/ors-summary.html
@@ -27,6 +27,49 @@
             </div>
             <div class="bottom-border">
             </div>
+            <div class="options-box" ng-if="route.summary.ofs">
+                <div class="margin-bottom-6" ng-click="showFuelInfo = !showFuelInfo" ng-init="showFuelInfo = true;">
+                    <span>
+                        <i ng-class="$ctrl.getClass(showFuelInfo)">
+                        </i>
+                    </span>
+                    <span ng-bind-html="('FUEL_CONSUMPTION' | translate)">
+                    </span>
+                </div>
+                <div style="color: grey; font-style: italic" ng-if="showFuelInfo" ng-bind-html="('_FOR' | translate) + ' ' + route.summary.ofs.request_id + ':'"></div>
+                <br>
+                <div ng-repeat="(vehicleClass, info) in route.summary.ofs['fuel_stats']" ng-if="showFuelInfo">
+                    <div ng-if="$ctrl.classInQuery(route.summary.ofs, vehicleClass) || (vehicleClass==='individual' && $first)">
+                        <div ng-if="info['category_info']['calculation_errors'] !== 'No Errors'">
+                            <div>Not enough data to calculate category {{$ctrl.carCategories[vehicleClass].en}}</div>
+                        </div>
+                        <div ng-if="info['category_info']['calculation_errors'] === 'No Errors'">
+                            <div ng-if="heading !== 'route'" ng-repeat="(heading, content) in info">
+                                <table class="ui celled teal compact small table">
+                                    <thead>
+                                        <tr>
+                                            <th ng-bind-html="heading.split('_').join(' ') | capitalize"></th><th></th>
+                                        </tr>
+                                    </thead>
+                                    <tbody align="right">
+                                    <tr ng-repeat="(key,value) in content">
+                                        <td class="entry" ng-bind-html="key.split('_').join(' ').replace('per','/')"></td>
+                                        <td class="entry">{{value}}</td>
+                                    </tr>
+                                    </tbody>
+                                </table>
+                                <br>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div ng-if="route.summary.ofs['attributions'] && showFuelInfo" style="color: grey; font-style: italic">
+                    <div >Attributions:</div>
+                    <div ng-repeat="source in route.summary.ofs['attributions']">{{source}}</div>
+                </div>
+            </div>
+            <div class="bottom-border">
+            </div>
         </li>
     </ul>
 </div>
diff --git a/app/components/ors-panel-routing/ors-summary/ors-summary.js b/app/components/ors-panel-routing/ors-summary/ors-summary.js
index eb1330ac..8ff66ffa 100755
--- a/app/components/ors-panel-routing/ors-summary/ors-summary.js
+++ b/app/components/ors-panel-routing/ors-summary/ors-summary.js
@@ -16,15 +16,18 @@ angular
       "orsObjectsFactory",
       "orsRouteService",
       "lists",
+      "carCategories",
       function(
         $rootScope,
         orsSettingsFactory,
         orsMapFactory,
         orsObjectsFactory,
         orsRouteService,
-        lists
+        lists,
+        carCategories
       ) {
         let ctrl = this;
+        ctrl.carCategories = carCategories;
         ctrl.checkboxes = [false, false, false, false];
         ctrl.showShare = false;
         ctrl.showExport = false;
@@ -78,6 +81,9 @@ angular
         ctrl.DeEmphRoute = () => {
           orsRouteService.DeEmph();
         };
+        ctrl.classInQuery = (ofsData, vehicleClass) => {
+          return ofsData.general.vehicle_categories.indexOf(vehicleClass) > -1;
+        };
       }
     ]
   });
diff --git a/app/components/ors-panel-routing/ors-waypoints/ors-route-controls/ors-options/ors-options.html b/app/components/ors-panel-routing/ors-waypoints/ors-route-controls/ors-options/ors-options.html
index b9fa9158..408a5e20 100755
--- a/app/components/ors-panel-routing/ors-waypoints/ors-route-controls/ors-options/ors-options.html
+++ b/app/components/ors-panel-routing/ors-waypoints/ors-route-controls/ors-options/ors-options.html
@@ -35,22 +35,7 @@
                     </input>
                 </div>
             </li>
-            <li ng-show="$ctrl.activeSubgroup == 'Car' || $ctrl.activeSubgroup == 'Bicycle' || $ctrl.activeSubgroup == 'HeavyVehicle'">
-                <div class="ui checkbox">
-                    <input id="unpaved" name="orsRouteAvoidablesInput" ng-change="$ctrl.changeOptions()" ng-model="$ctrl.currentOptions.avoidables.unpaved" type="checkbox">
-                        <label for="unpaved" ng-bind-html="('UNPAVED' | translate)">
-                        </label>
-                    </input>
-                </div>
-            </li>
-            <li ng-show="$ctrl.activeSubgroup == 'Car' || $ctrl.activeSubgroup == 'Bicycle' || $ctrl.activeSubgroup == 'HeavyVehicle'">
-                <div class="ui checkbox">
-                    <input id="paved" name="orsRouteAvoidablesInput" ng-change="$ctrl.changeOptions()" ng-model="$ctrl.currentOptions.avoidables.paved" type="checkbox">
-                        <label for="paved" ng-bind-html="('PAVED' | translate)">
-                        </label>
-                    </input>
-                </div>
-            </li>
+
             <li ng-show="$ctrl.activeSubgroup == 'Car' || $ctrl.activeSubgroup == 'Pedestrian' || $ctrl.activeSubgroup == 'Bicycle' || $ctrl.activeSubgroup == 'HeavyVehicle'">
                 <div class="ui checkbox">
                     <input id="fords" name="orsRouteAvoidablesInput" ng-change="$ctrl.changeOptions()" ng-model="$ctrl.currentOptions.avoidables.fords" type="checkbox">
@@ -83,22 +68,6 @@
                     </input>
                 </div>
             </li>
-            <li ng-show="$ctrl.activeSubgroup == 'Car' || $ctrl.activeSubgroup == 'HeavyVehicle'">
-                <div class="ui checkbox">
-                    <input id="tunnels" name="orsRouteAvoidablesInput" ng-change="$ctrl.changeOptions()" ng-model="$ctrl.currentOptions.avoidables.tunnels" type="checkbox">
-                        <label for="tunnels" ng-bind-html="('TUNNELS' | translate)">
-                        </label>
-                    </input>
-                </div>
-            </li>
-            <li ng-show="$ctrl.activeSubgroup == 'Car' || $ctrl.activeSubgroup == 'HeavyVehicle'">
-                <div class="ui checkbox">
-                    <input id="tracks" name="orsRouteAvoidablesInput" ng-change="$ctrl.changeOptions()" ng-model="$ctrl.currentOptions.avoidables.tracks" type="checkbox">
-                        <label for="tracks" ng-bind-html="('TRACKS' | translate)">
-                        </label>
-                    </input>
-                </div>
-            </li>
         </ul>
     </div>
 </div>
@@ -155,47 +124,53 @@
                 <div class="row">
                     <table id="results">
                         <tbody>
-                            <tr ng-repeat="country in $ctrl.countries | filter: checked ">
-                                <td>
-                                    <input class="ui checkbox" id="c_{{country.cid}}" name="orsRouteAvoidablesCountries" ng-change="$ctrl.toggleCountries(country.id)" ng-disabled="!$ctrl.avoidCountries || $ctrl.currentOptions.borders.all" ng-model="$ctrl.countries[country.id].check" type="checkbox">
-                                    </input>
-                                </td>
-                                <td id="cname">
-                                    {{country[$ctrl.language]}}
-                                </td>
-                                <td id="ename">
-                                    <i>
-                                        <small>
-                                            ({{country.official_en_name}})
-                                        </small>
-                                    </i>
-                                </td>
-                            </tr>
-                            <tr ng-if="$ctrl.queryCountries" ng-repeat="country in $ctrl.countries | filter: search ">
-                                <td>
-                                    <input class="ui checkbox" id="c_{{country.cid}}" name="orsRouteAvoidablesCountries" ng-change="$ctrl.toggleCountries(country.id)" ng-disabled="$ctrl.currentOptions.borders.all" ng-model="$ctrl.countries[country.id].check" type="checkbox">
-                                    </input>
-                                </td>
-                                <td id="cname">
-                                    {{country[$ctrl.language]}}
-                                </td>
-                                <td align="right" hidden="" id="cid">
-                                    ({{country.cid}})
-                                </td>
-                                <td id="ename">
-                                    <i>
-                                        <small>
-                                            ({{country.official_en_name}})
-                                        </small>
-                                    </i>
-                                </td>
-                                <td hidden="" id="nname">
-                                    {{country.native_names}}
-                                </td>
-                                <td hidden="" id="ccode">
-                                    {{country.country_code}}
-                                </td>
-                            </tr>
+                        <tr ng-repeat="country in $ctrl.countries | filter: checked ">
+                            <td>
+                                <input class="ui checkbox" id="c_{{country.cid}}" name="orsRouteAvoidablesCountries"
+                                       ng-change="$ctrl.toggleCountries(country.id)"
+                                       ng-disabled="!$ctrl.avoidCountries || $ctrl.currentOptions.borders.all"
+                                       ng-model="$ctrl.countries[country.id].check" type="checkbox">
+                                </input>
+                            </td>
+                            <td id="cname">
+                                {{country[$ctrl.language]}}
+                            </td>
+                            <td id="ename">
+                                <i>
+                                    <small>
+                                        ({{country.official_en_name}})
+                                    </small>
+                                </i>
+                            </td>
+                        </tr>
+                        <tr ng-if="$ctrl.queryCountries" ng-repeat="country in $ctrl.countries | filter: search ">
+                            <td>
+                                <input class="ui checkbox" id="c_{{country.cid}}" name="orsRouteAvoidablesCountries"
+                                       ng-change="$ctrl.toggleCountries(country.id)"
+                                       ng-disabled="$ctrl.currentOptions.borders.all"
+                                       ng-model="$ctrl.countries[country.id].check" type="checkbox">
+                                </input>
+                            </td>
+                            <td id="cname">
+                                {{country[$ctrl.language]}}
+                            </td>
+                            <td align="right" hidden="" id="cid">
+                                ({{country.cid}})
+                            </td>
+                            <td id="ename">
+                                <i>
+                                    <small>
+                                        ({{country.official_en_name}})
+                                    </small>
+                                </i>
+                            </td>
+                            <td hidden="" id="nname">
+                                {{country.native_names}}
+                            </td>
+                            <td hidden="" id="ccode">
+                                {{country.country_code}}
+                            </td>
+                        </tr>
                         </tbody>
                     </table>
                 </div>
@@ -203,40 +178,270 @@
         </ul>
     </div>
 </div>
-<div class="options-box" ng-show="$ctrl.activeSubgroup == 'Bicycle'">
-    <div class="pointer" ng-click="difficultyOptions = !difficultyOptions">
-        <i ng-class="$ctrl.getClass(difficultyOptions)">
+<div class="options-box" ng-if="$ctrl.routing" ng-show="$ctrl.activeSubgroup == 'Car'">
+    <div class="pointer" ng-click="fuelSettings = !fuelSettings">
+        <i ng-class="$ctrl.getClass(fuelSettings)">
         </i>
-        <span ng-bind-html="('DIFFICULTY' | translate)">
+        <span ng-bind-html="('FUEL_CONSUMPTION' | translate)">
         </span>
     </div>
-    <div class="collapsable" ng-class="{ showMe: difficultyOptions }">
-        <div class="ors-options-menu">
-            <div class="ui label tiny flleft">
-                <span ng-bind-html="('FITNESS' | translate)">
-                </span>
-                <span ng-bind-html="':'">
+    <div class="collapsable" ng-class="{ showMe: fuelSettings }">
+        <ul class="ors-options-menu">
+            <li>
+                <div class="ui checkbox">
+                    <input
+                            id="brandCheck"
+                            name="orsCarBrands"
+                            ng-click="$ctrl.toggleSource('brand')"
+                            ng-model="$ctrl.brandCheck" type="checkbox">
+                    <label for="brandCheck"
+                           ng-style="!$ctrl.brandCheck ? {color:'grey'} : undefined"
+                           ng-bind-html="('CAR_BRAND' | translate)"
+                           ng-click="$ctrl.toggleSource('brand')">
+                    </label>
+                </div>
+                <div ng-if="$ctrl.brandCheck">
+                    <div>
+                        <label for="brandInput"></label>
+                        <div class="ors-options-input ui input" id="brandInput">
+                            <input ng-model="$ctrl.queryBrand"
+                                   ng-model-options="{debounce: 300}"
+                                   ng-change="$ctrl.queryModel = ''"
+                                   ng-focus="$ctrl.focusBrand = true"
+                                   placeholder="{{('SEARCH' | translate)}} {{('CAR_BRAND' | translate)}}" select-on-click="" type="text">
+                        </div>
+                        <span tooltip-side="right" tooltip-template="{{('_RESET' | translate)}} {{('CAR_BRAND' | translate)}}" tooltips="">
+                        <button class="ors-controls-button"
+                                ng-click="$ctrl.focusBrand = false; $ctrl.queryBrand = undefined; $ctrl.carResponse = undefined; $ctrl.showModel = false; $ctrl.showYear = false; $ctrl.showType = false">
+                            <i class="fa fa-remove">
+                            </i>
+                        </button>
+                        </span>
+                    </div>
+                    <div class="row" ng-if="$ctrl.focusBrand">
+                        <table id="brandResults">
+                            <tbody>
+                            <tr ng-repeat="brand in $ctrl.carBrands | filter: searchBrand">
+                                <td>
+                                    <div ng-click="$ctrl.queryBrand = brand;$ctrl.requestCars(brand);$ctrl.focusBrand = false;$ctrl.showModel = true; $ctrl.yearCheck = false; $ctrl.typeCheck = false">{{brand}}</div>
+                                </td>
+                            </tr>
+                            </tbody>
+                        </table>
+                    </div>
+                </div>
+            </li>
+            <li ng-if="$ctrl.showModel">
+                <div ng-if="$ctrl.brandCheck">
+                    <div class="ui checkbox">
+                        <input
+                                id="modelCheck"
+                                ng-click="$ctrl.toggleSource('model')"
+                                ng-model="$ctrl.modelCheck" type="checkbox">
+                        <label for="modelCheck"
+                               ng-bind-html="('CAR_MODEL' | translate)"
+                               ng-click="$ctrl.toggleSource('model')">
+                        </label>
+                    </div>
+                    <div ng-if="$ctrl.modelCheck">
+                        <div class="ors-select-tooltip">
+                            <label for="modelInput"></label>
+                            <div class="ors-options-input ui input" id="modelInput">
+                                <select class="ui selection dropdown no-wrap"
+                                        ng-model="$ctrl.queryModel"
+                                        ng-change="$ctrl.queryYear = ''; $ctrl.set('carYears'); $ctrl.carTypes = []; $ctrl.showYear = true"
+                                        ng-focus="$ctrl.focusModel = true"
+                                        ng-options="model for model in $ctrl.carModels"
+                                        type="text"></select>
+                            </div>
+                            <span style="padding-top: 9px" tooltip-side="right" tooltip-template="{{('_RESET' | translate)}} {{('CAR_MODEL' | translate)}}" tooltips="">
+                            <button class="ors-controls-button"
+                                    ng-click="$ctrl.queryModel = undefined; $ctrl.showYear = false; $ctrl.showType = false">
+                                <i class="fa fa-remove">
+                                </i>
+                            </button>
+                            </span>
+                        </div>
+                    </div>
+                </div>
+            </li>
+            <li ng-if="$ctrl.showYear">
+                <div ng-if="$ctrl.modelCheck && $ctrl.brandCheck">
+                    <div class="ui checkbox">
+                    <input
+                            id="yearCheck"
+                            ng-click="$ctrl.toggleSource('year')"
+                            ng-model="$ctrl.yearCheck" type="checkbox">
+                    <label for="yearCheck"
+                           ng-bind-html="('CAR_YEAR' | translate)"
+                           ng-click="$ctrl.toggleSource('year')">
+                    </label>
+                    </div>
+                    <div ng-if="$ctrl.yearCheck">
+                        <div class="ors-select-tooltip">
+                            <label for="yearInput"></label>
+                            <div class="ors-options-input ui input" id="yearInput">
+                                <select class="ui selection dropdown no-wrap"
+                                        ng-model="$ctrl.queryYear"
+                                        ng-change="$ctrl.queryType = ''; $ctrl.showType = true; $ctrl.set('carTypes');$ctrl.focusYear = false"
+                                        ng-focus="$ctrl.focusYear = true"
+                                        ng-options="year for year in $ctrl.filterOutAll($ctrl.carYears)" type="text"></select>
+                            </div>
+                            <span tooltip-side="right" tooltip-template="{{('_RESET' | translate)}} {{('CAR_YEAR' | translate)}}" tooltips="">
+                            <button class="ors-controls-button"
+                                    ng-click="$ctrl.queryYear = undefined; $ctrl.showType = false">
+                                <i class="fa fa-remove">
+                                </i>
+                            </button>
+                            </span>
+                        </div>
+                    </div>
+                </div>
+            </li>
+            <li ng-if="$ctrl.showType">
+                <div ng-if="$ctrl.modelCheck && $ctrl.brandCheck && $ctrl.yearCheck">
+                    <div class="ui checkbox">
+                        <input
+                                id="typeCheck"
+                                ng-click="$ctrl.toggleSource('type')"
+                                ng-model="$ctrl.typeCheck" type="checkbox">
+                        <label for="typeCheck"
+                               ng-bind-html="('CAR_TYPE' | translate)"
+                               ng-click="$ctrl.toggleSource('type')">
+                        </label>
+                    </div>
+                    <div ng-if="$ctrl.typeCheck">
+                        <div class="ors-select-tooltip">
+                            <label for="typeInput"></label>
+                            <div class="ors-options-input ui input" id="typeInput">
+                                <select class="ui selection dropdown"
+                                        ng-model="$ctrl.queryType"
+                                        ng-options="type for type in $ctrl.filterOutAll($ctrl.carTypes)"
+                                        ng-change="$ctrl.set('carTypes');"
+                                        type="text"></select>
+                            </div>
+                            <span tooltip-side="right" tooltip-template="{{( '_RESET' | translate)}} {{( 'CAR_TYPE' | translate)}}" tooltips="">
+                                <button class="ors-controls-button"
+                                        ng-click="$ctrl.queryType = undefined">
+                                    <i class="fa fa-remove">
+                                    </i>
+                                </button>
+                            </span>
+                        </div>
+                    </div>
+                </div>
+            </li>
+            <li>
+                <div class="ui checkbox">
+                    <input type="checkbox"
+                           id="categoryCheck"
+                           ng-model="$ctrl.categoryCheck"
+                           ng-click="$ctrl.toggleSource('category')"
+                    >
+                    <label for="categoryCheck"
+                           ng-style="!$ctrl.categoryCheck ? {color:'grey'} : undefined"
+                           ng-bind-html="('VEHICLE_CATEGORY' | translate) + ': '"
+                           ng-click="$ctrl.toggleSource('category')">
+                    </label>
+                </div>
+                <div ng-if="$ctrl.categoryCheck">
+                    <label for="vehicleCategory">
+                    </label>
+                    <select class="ors-options-input ui selection dropdown no-wrap"
+                            id="vehicleCategory"
+                            ng-model="$ctrl.ofs.filters.vehicle_categories[0]"
+                            ng-change="$ctrl.chooseCategory()"
+                            ng-options="category.short as category.en for category in $ctrl.carCategories"></select>
+                </div>
+            </li>
+            <li>
+                <div>
+                    <label for="fuelType" ng-bind-html="('FUEL_TYPE' | translate) + ': '">
+                    </label>
+                    <select class="ors-options-input ui selection dropdown"
+                            id="fuelType" ng-model="$ctrl.ofs.filters.fuel_type"
+                            ng-options="fueltype for fueltype in ['gasoline','diesel']"></select>
+                </div>
+            </li>
+            <li>
+                <span>
+                    <label for="drivingSpeed" ng-bind-html="('DRIVING_SPEED' | translate) + ': '">
+                    </label>
+                    <span class="row ui input">
+                        <input id="drivingSpeed"
+                               ng-model="$ctrl.ofs.filters.driving_speed"
+                               style="width: 60px"
+                        >
+                    </span>
                 </span>
-                <div class="detail" ng-bind-html="$ctrl.fitnessValue">
+            </li>
+            <li>
+                <div class="ui divider">
                 </div>
-            </div>
-            <rzslider rz-slider-model="$ctrl.difficultySliders.Fitness.value" rz-slider-options="$ctrl.difficultySliders.Fitness.options">
-            </rzslider>
-            <div class="ui divider">
-            </div>
-            <div class="ui checkbox" id="cb-avoidhills">
-                <input id="avoidhills" name="orsRouteDifficultyAvoidHills" ng-change="$ctrl.changeOptions()" ng-model="$ctrl.currentOptions.difficulty.avoidhills" type="checkbox">
-                    <label for="avoidhills" ng-bind-html="('AVOIDHILLS' | translate)">
+                <div>
+                    <p class="-italic" ng-bind-html="('OPTIONAL_PARAMS' | translate)"></p>
+                </div>
+                <div>
+                    <span class="ui checkbox">
+                        <input id="consumptionCheck" type="checkbox" value="$ctrl.fuelConsumption" ng-model="$ctrl.fuelConsumption"
+                           ng-click="$ctrl.fuelConsumption != $ctrl.fuelConsumption">
+                        <label for="consumptionCheck" class="ors-options-label"></label>
+                    </span>
+                    <label for="fuelConsumption" ng-bind-html="('SPECIFIC_FUEL_CONSUMPTION' | translate) + ': '">
                     </label>
-                </input>
-            </div>
-            <div class="ui divider">
-            </div>
-            <div class="ui label tiny flleft" ng-bind-html="('MAXIMUMSTEEPNESS' | translate)">
-            </div>
-            <rzslider rz-slider-model="$ctrl.difficultySliders.Steepness.value" rz-slider-options="$ctrl.difficultySliders.Steepness.options">
-            </rzslider>
-        </div>
+                    <span class="row ui input">
+                        <input id="fuelConsumption"
+                               ng-disabled="!$ctrl.fuelConsumption"
+                               ng-model="$ctrl.ofs.filters.fuel_consumptions[$ctrl.ofs.filters.vehicle_categories[0]]"
+                               style="width: 60px"
+                        >
+                    </span>
+                    <div>
+                        in litres per 100 km
+                    </div>
+                </div>
+            </li>
+            <li>
+                <div>
+                    <span class="ui checkbox">
+                        <input id="tankSizeCheck" type="checkbox" value="$ctrl.tankSize" ng-model="$ctrl.tankSize"
+                           ng-click="$ctrl.tankSize != $ctrl.tankSize">
+                        <label for="tankSizeCheck" class="ors-options-label"></label>
+                    </span>
+                    <label for="tankSize" ng-bind-html="('TANK_SIZE' | translate) + ': '">
+                    </label>
+                    <span class="row ui input">
+                        <input id="tankSize"
+                               ng-disabled="!$ctrl.tankSize"
+                               ng-model="$ctrl.ofs.filters.tank_sizes[$ctrl.ofs.filters.vehicle_categories[0]]"
+                               style="width : 60px"
+                        >
+                    </span>
+                     liters
+                </div>
+            </li>
+            <li>
+                <div class="ui divider">
+                </div>
+                <span>
+                    <button ng-class="{
+                                'tiny teal ui button disabled': !(($ctrl.categoryCheck)||($ctrl.modelCheck && $ctrl.queryModel && $ctrl.queryBrand)),
+                                'tiny teal ui button': !$ctrl.requesting && (($ctrl.categoryCheck)||($ctrl.modelCheck && $ctrl.queryModel && $ctrl.queryBrand)),
+                                'tiny teal ui button loading': $ctrl.requesting}"
+                            ng-click="$ctrl.requestConsumption()"
+                            class="tiny teal ui button">
+                        <i class="fa gas-pump">
+                        </i>
+                        <span ng-bind-html="('CALC_CONSUMPTION' | translate)" class="ng-binding"></span>
+                    </button>
+                </span>
+                <span class="ui checkbox">
+                        <input id="autoCall" type="checkbox" value="$ctrl.autoCall" ng-model="$ctrl.autoCall"
+                               ng-click="$ctrl.toggleAutoCall()"/>
+                        <label for="autoCall" class="ors-options-label">{{( "ON_ROUTE_CHANGE" | translate)}}</label>
+                </span>
+            </li>
+        </ul>
     </div>
 </div>
 <div class="options-box" ng-show="$ctrl.activeSubgroup == 'HeavyVehicle'">
@@ -311,7 +516,7 @@
         </ul>
     </div>
 </div>
-<div class="options-box" ng-show="$ctrl.activeSubgroup == 'Car' || $ctrl.activeSubgroup == 'Bicycle' || $ctrl.activeSubgroup == 'Wheelchair' || $ctrl.activeSubgroup == 'HeavyVehicle' || $ctrl.activeSubgroup == 'Pedestrian'">
+<div class="options-box" ng-show="$ctrl.activeSubgroup == 'Pedestrian'">
     <div class="pointer" ng-click="additionalOptions = !additionalOptions">
         <i ng-class="$ctrl.getClass(additionalOptions)">
         </i>
@@ -327,21 +532,12 @@
                 </input>
             </div>
         </div>
-        <div class="ors-options-menu">
-            <div class="ui checkbox">
-                <input id="maximumspeed" name="orsRouteMaximumspeedInput" ng-change="$ctrl.toggleMaxspeedSlider()" ng-model="$ctrl.maxspeedCheckbox" type="checkbox">
-                    <label for="maximumspeed" ng-bind-html="('MAXIMUMSPEED' | translate)">
-                    </label>
-                </input>
-            </div>
-            <rzslider rz-slider-model="$ctrl.maxspeedSlider.value" rz-slider-options="$ctrl.maxspeedSlider.options">
-            </rzslider>
-        </div>
         <div class="ors-options-menu" ng-show="$ctrl.activeSubgroup == 'Pedestrian'">
             <div class="ui checkbox">
-                <input id="greenrouting" name="orsRouteGreenRoutingInput" ng-change="$ctrl.toggleGreenSlider()" ng-model="$ctrl.greenActive" type="checkbox">
-                    <label for="greenrouting" ng-bind-html="('GREEN_ROUTING' | translate)">
-                    </label>
+                <input id="greenrouting" name="orsRouteGreenRoutingInput" ng-change="$ctrl.toggleGreenSlider()"
+                       ng-model="$ctrl.greenActive" type="checkbox">
+                <label for="greenrouting" ng-bind-html="('GREEN_ROUTING' | translate)">
+                </label>
                 </input>
             </div>
             <rzslider rz-slider-model="$ctrl.greenSlider.value" rz-slider-options="$ctrl.greenSlider.options">
@@ -349,9 +545,10 @@
         </div>
         <div class="ors-options-menu" ng-show="$ctrl.activeSubgroup == 'Pedestrian'">
             <div class="ui checkbox">
-                <input id="greenrouting" name="orsRouteQuietRoutingInput" ng-change="$ctrl.toggleQuietSlider()" ng-model="$ctrl.quietActive" type="checkbox">
-                    <label for="quietrouting" ng-bind-html="('QUIET_ROUTING' | translate)">
-                    </label>
+                <input id="quietrouting" name="orsRouteQuietRoutingInput" ng-change="$ctrl.toggleQuietSlider()"
+                       ng-model="$ctrl.quietActive" type="checkbox">
+                <label for="quietrouting" ng-bind-html="('QUIET_ROUTING' | translate)">
+                </label>
                 </input>
             </div>
             <rzslider rz-slider-model="$ctrl.quietSlider.value" rz-slider-options="$ctrl.quietSlider.options">
diff --git a/app/components/ors-panel-routing/ors-waypoints/ors-route-controls/ors-options/ors-options.js b/app/components/ors-panel-routing/ors-waypoints/ors-route-controls/ors-options/ors-options.js
index 18763bdd..1da2be89 100755
--- a/app/components/ors-panel-routing/ors-waypoints/ors-route-controls/ors-options/ors-options.js
+++ b/app/components/ors-panel-routing/ors-waypoints/ors-route-controls/ors-options/ors-options.js
@@ -13,10 +13,12 @@ angular.module("orsApp.ors-options", []).component("orsOptions", {
     "orsUtilsService",
     "orsRequestService",
     "orsParamsService",
+    "orsFuelService",
     "$scope",
     "$timeout",
     "lists",
     "countries",
+    "carCategories",
     function(
       orsSettingsFactory,
       orsCookiesFactory,
@@ -24,16 +26,29 @@ angular.module("orsApp.ors-options", []).component("orsOptions", {
       orsUtilsService,
       orsRequestService,
       orsParamsService,
+      orsFuelService,
       $scope,
       $timeout,
       lists,
-      countries
+      countries,
+      carCategories
     ) {
       let ctrl = this;
       ctrl.optionList = lists.optionList;
       ctrl.$onInit = () => {
         /** This is a reference of the settings object, if we change here, it is updated in settings */
         ctrl.currentOptions = orsSettingsFactory.getActiveOptions();
+
+        let brandsRequest = orsFuelService.getBrands();
+        brandsRequest.promise.then(
+          brandsResponse => {
+            ctrl.carBrands = brandsResponse.brands;
+          },
+          brandsError => {
+            console.log(brandsError);
+          }
+        );
+
         // preference/weight is only considered for routing panel
         if (ctrl.routing)
           ctrl.currentOptions.weight =
@@ -64,43 +79,6 @@ angular.module("orsApp.ors-options", []).component("orsOptions", {
             }
           }
         };
-        // set maxspeed slider from params
-        ctrl.maxspeedOptions = ctrl.optionList.maxspeeds[ctrl.activeSubgroup];
-        // enable or disable checkbox depending on whether maxspeed is set
-        let maxspeedVal;
-        if (ctrl.currentOptions.maxspeed >= 0) {
-          maxspeedVal = ctrl.currentOptions.maxspeed;
-          ctrl.maxspeedCheckbox = true;
-        } else {
-          maxspeedVal = ctrl.maxspeedOptions.default;
-          ctrl.maxspeedCheckbox = false;
-        }
-        ctrl.toggleMaxspeedSlider = (fireRequest = true) => {
-          if (ctrl.maxspeedCheckbox === true) {
-            ctrl.maxspeedSlider.options.disabled = false;
-            ctrl.currentOptions.maxspeed = ctrl.maxspeedSlider.value;
-          } else if (ctrl.maxspeedCheckbox === false) {
-            ctrl.maxspeedSlider.options.disabled = true;
-            delete ctrl.currentOptions.maxspeed;
-          }
-          if (fireRequest) ctrl.changeOptions();
-        };
-        ctrl.maxspeedSlider = {
-          value: maxspeedVal,
-          options: {
-            floor: ctrl.maxspeedOptions.min,
-            ceil: ctrl.maxspeedOptions.max,
-            step: ctrl.maxspeedOptions.step,
-            translate: value => {
-              return value + " <b>km/h</b>";
-            },
-            onEnd: () => {
-              ctrl.currentOptions.maxspeed = ctrl.maxspeedSlider.value;
-              ctrl.changeOptions();
-            }
-          }
-        };
-        ctrl.toggleMaxspeedSlider(false);
         ctrl.greenActive = false;
         ctrl.toggleGreenSlider = (fireRequest = true) => {
           if (ctrl.greenActive === true) {
@@ -323,72 +301,6 @@ angular.module("orsApp.ors-options", []).component("orsOptions", {
           }
         };
         ctrl.toggleHgvOptSlider("", false);
-        // Difficulty settings
-        ctrl.currentOptions.fitness =
-          ctrl.currentOptions.fitness !== undefined
-            ? ctrl.optionList.difficulty.fitness[ctrl.currentOptions.fitness]
-                .value
-            : ctrl.optionList.difficulty.fitness["-1"].value;
-        ctrl.fitnessValue =
-          ctrl.optionList.difficulty.fitness[ctrl.currentOptions.fitness].name;
-        ctrl.currentOptions.steepness =
-          ctrl.currentOptions.steepness !== undefined
-            ? ctrl.currentOptions.steepness
-            : ctrl.optionList.difficulty.steepness.min;
-        ctrl.avoidHillsCheckbox();
-        ctrl.difficultySliders = {
-          Fitness: {
-            value: ctrl.currentOptions.fitness,
-            options: {
-              stepsArray: [
-                {
-                  value: ctrl.optionList.difficulty.fitness["-1"].value
-                },
-                {
-                  value: ctrl.optionList.difficulty.fitness["0"].value
-                },
-                {
-                  value: ctrl.optionList.difficulty.fitness["1"].value
-                },
-                {
-                  value: ctrl.optionList.difficulty.fitness["2"].value
-                },
-                {
-                  value: ctrl.optionList.difficulty.fitness["3"].value
-                }
-              ],
-              showTicks: true,
-              showTicksValues: false,
-              hidePointerLabels: true,
-              hideLimitLabels: true,
-              onEnd: () => {
-                ctrl.currentOptions.fitness =
-                  ctrl.difficultySliders.Fitness.value;
-                ctrl.changeOptions();
-                ctrl.avoidHillsCheckbox();
-                ctrl.fitnessValue =
-                  ctrl.optionList.difficulty.fitness[
-                    ctrl.currentOptions.fitness
-                  ].name;
-              }
-            }
-          },
-          Steepness: {
-            value: ctrl.currentOptions.steepness,
-            options: {
-              floor: ctrl.optionList.difficulty.steepness.min,
-              ceil: ctrl.optionList.difficulty.steepness.max,
-              translate: value => {
-                return value + " <b>%</b>";
-              },
-              onEnd: () => {
-                ctrl.currentOptions.steepness =
-                  ctrl.difficultySliders.Steepness.value;
-                ctrl.changeOptions();
-              }
-            }
-          }
-        };
         // wheelchair sliders
         ctrl.currentOptions.surface =
           ctrl.currentOptions.surface !== undefined
@@ -563,20 +475,6 @@ angular.module("orsApp.ors-options", []).component("orsOptions", {
       };
       ctrl.$onChanges = changesObj => {
         if (changesObj.showOptions) ctrl.refreshSlider();
-        if (changesObj.activeSubgroup || changesObj.activeProfile) {
-          ctrl.maxspeedOptions = ctrl.optionList.maxspeeds[ctrl.activeSubgroup];
-          // check if already initiated
-          /** update slider settings */
-          if (ctrl.maxspeedSlider) {
-            ctrl.maxspeedSlider.value = ctrl.maxspeedOptions.default;
-            ctrl.maxspeedSlider.options.floor = ctrl.maxspeedOptions.min;
-            ctrl.maxspeedSlider.options.ceil = ctrl.maxspeedOptions.max;
-            ctrl.maxspeedSlider.options.step = ctrl.maxspeedOptions.step;
-            if (ctrl.currentOptions.maxspeed) {
-              ctrl.currentOptions.maxspeed = ctrl.maxspeedSlider.value;
-            }
-          }
-        }
       };
       // Get the app route, we need this to know whether to fire a request when the options change
       orsSettingsFactory.subscribeToNgRoute(function onNext(route) {
@@ -586,7 +484,7 @@ angular.module("orsApp.ors-options", []).component("orsOptions", {
         // call setoptions
         if (ctrl.currentOptions.difficulty)
           ctrl.difficultySliders.Fitness.options.disabled =
-            ctrl.currentOptions.difficulty.avoidhills === true ? true : false;
+            ctrl.currentOptions.difficulty.avoidhills === true;
         orsSettingsFactory.setActiveOptions(ctrl.currentOptions, ctrl.routing);
       };
       ctrl.getClass = bool => {
@@ -681,6 +579,137 @@ angular.module("orsApp.ors-options", []).component("orsOptions", {
           (!row.hasOwnProperty("check") || row.check === false)
         );
       };
+
+      // OFS options
+      ctrl.carCategories = carCategories;
+      ctrl.categoryCheck = true;
+      ctrl.carModels = ctrl.carYears = ctrl.carTypes = [];
+      ctrl.set = list => {
+        ctrl[list] =
+          list === "carYears"
+            ? Object.keys(ctrl.carResponse[ctrl.queryModel])
+            : list === "carTypes" && ctrl.queryYear
+              ? Object.keys(ctrl.carResponse[ctrl.queryModel][ctrl.queryYear])
+              : list;
+      };
+      ctrl.chooseCategory = () => {
+        // rename Object key of the filters.fuel_consumptions and keep value
+        const renameKey = (o, newKey) => {
+          if (Object.keys(o)[0] !== newKey) {
+            Object.defineProperty(
+              o,
+              newKey,
+              Object.getOwnPropertyDescriptor(o, Object.keys(o)[0])
+            );
+            delete o[Object.keys(o)[0]];
+          }
+        };
+        if (ctrl.tankSize)
+          renameKey(
+            ctrl.ofs.filters.tank_sizes,
+            ctrl.ofs.filters.vehicle_categories[0]
+          );
+        if (ctrl.fuelConsumption)
+          renameKey(
+            ctrl.ofs.filters.fuel_consumptions,
+            ctrl.ofs.filters.vehicle_categories[0]
+          );
+      };
+      ctrl.toggleSource = source => {
+        if (source === "category") {
+          ctrl.brandCheck = !ctrl.categoryCheck;
+        } else if (source === "brand") {
+          ctrl.categoryCheck = !ctrl.brandCheck;
+        }
+      };
+      ctrl.requestConsumption = () => {
+        if (ctrl.brandCheck) {
+          if (ctrl.queryType) {
+            ctrl.ofs.filters.cfd_ids =
+              ctrl.carResponse[ctrl.queryModel][ctrl.queryYear][ctrl.queryType];
+            ctrl.ofs.filters.request_id = `${ctrl.queryBrand} - ${
+              ctrl.queryModel
+            } (${ctrl.queryYear}) ${ctrl.queryType}`;
+          } else if (ctrl.queryYear) {
+            ctrl.ofs.filters.cfd_ids =
+              ctrl.carResponse[ctrl.queryModel][ctrl.queryYear].all;
+            ctrl.ofs.filters.request_id = `${ctrl.queryBrand} - ${
+              ctrl.queryModel
+            } (${ctrl.queryYear})`;
+          } else if (ctrl.queryModel) {
+            ctrl.ofs.filters.cfd_ids = ctrl.carResponse[ctrl.queryModel].all;
+            ctrl.ofs.filters.request_id = `${ctrl.queryBrand} - ${
+              ctrl.queryModel
+            }`;
+          }
+        } else {
+          ctrl.ofs.filters.request_id =
+            ctrl.carCategories[ctrl.ofs.filters.vehicle_categories[0]].en;
+        }
+        ctrl.currentOptions.ofs = ctrl.ofs;
+        if (ctrl.categoryCheck) {
+          delete ctrl.currentOptions.ofs.filters.cfd_ids;
+        } else {
+          delete ctrl.currentOptions.ofs.filters.vehicle_categories[0];
+        }
+        orsSettingsFactory.setActiveOptions(ctrl.currentOptions);
+        ctrl.requesting = true;
+        orsFuelService.getConsumption(ctrl.currentOptions.ofs);
+        ctrl.requesting = false;
+        if (!ctrl.autoCall) {
+          ctrl.removeOfsSettings();
+        }
+      };
+      ctrl.filterOutAll = list => {
+        return list.filter(e => {
+          return e !== "all";
+        });
+      };
+      ctrl.removeOfsSettings = () => {
+        delete ctrl.currentOptions.ofs;
+        orsSettingsFactory.setActiveOptions(ctrl.currentOptions);
+      };
+      ctrl.requestCars = () => {
+        let carRequest = orsFuelService.getCars(ctrl.queryBrand);
+        carRequest.promise.then(
+          carResponse => {
+            ctrl.carResponse = carResponse;
+            ctrl.carModels = Object.keys(carResponse);
+          },
+          carError => {
+            console.log(carError);
+          }
+        );
+      };
+      ctrl.toggleAutoCall = () => {
+        if (!ctrl.autoCall) {
+          ctrl.removeOfsSettings();
+        } else {
+          ctrl.currentOptions.ofs = ctrl.ofs;
+          orsSettingsFactory.setActiveOptions(ctrl.currentOptions);
+        }
+      };
+      //
+      ctrl.ofs = {
+        filters: {
+          data_source: "cfd",
+          fuel_type: "gasoline",
+          vehicle_type: "car",
+          driving_speed: 60,
+          vehicle_categories: ["c"],
+          fuel_consumptions: {},
+          tank_sizes: {},
+          request_id: "medium cars"
+        }
+      };
+      $scope.searchBrand = row => {
+        return ctrl.queryBrand
+          ? !!(
+              row.toLowerCase().indexOf(ctrl.queryBrand.toLowerCase() || "") !==
+              -1
+            )
+          : row;
+      };
     }
   ]
 });
diff --git a/app/components/ors-panel-routing/ors-waypoints/ors-route-controls/ors-route-controls.js b/app/components/ors-panel-routing/ors-waypoints/ors-route-controls/ors-route-controls.js
index 29ee4781..c9087161 100755
--- a/app/components/ors-panel-routing/ors-waypoints/ors-route-controls/ors-route-controls.js
+++ b/app/components/ors-panel-routing/ors-waypoints/ors-route-controls/ors-route-controls.js
@@ -21,7 +21,7 @@ angular
         orsCookiesFactory
       ) {
         let ctrl = this;
-        ctrl.showOptions = false;
+        ctrl.showOptions = true;
         ctrl.add = () => {
           ctrl.onAdd();
           ctrl.showAdd = true;
diff --git a/app/components/ors-profiles-options/ors-profiles-options.html b/app/components/ors-profiles-options/ors-profiles-options.html
index ef76c3ae..a9358a90 100755
--- a/app/components/ors-profiles-options/ors-profiles-options.html
+++ b/app/components/ors-profiles-options/ors-profiles-options.html
@@ -58,7 +58,7 @@
             <i class="fa fa-lg fa-bicycle" ng-class="{active : $ctrl.activeSubgroup === $ctrl.profiles.Bicycle.name}">
             </i>
         </button>
-        <span>  
+        <span>
             <i class="fa fa-caret-down" style="margin-top: 20px;">
             </i>
             <ul class="ors-nav-submenu">
@@ -68,18 +68,6 @@
                         <label for="bicycle" ng-bind-html="('BICYCLENORMAL' | translate)"></label>
                     </div>
                 </li>
-                <!--<li>
-                    <div class="ui radio checkbox">
-                        <input name="orsProfileBicycle" ng-change="$ctrl.changeProfile()" ng-model="$ctrl.currentProfile.type" ng-value="$ctrl.profiles.BicycleSafety.name" type="radio" id="safety">
-                        <label for="safety" ng-bind-html="('BICYCLESAFEST' | translate)"></label>
-                    </div>
-                </li>-->
-                <li>
-                    <div class="ui radio checkbox">
-                        <input name="orsProfileBicycle" ng-change="$ctrl.changeProfile()" ng-model="$ctrl.currentProfile.type" ng-value="$ctrl.profiles.BicycleTour.name" type="radio" id="cycle">
-                        <label for="cycle" ng-bind-html="('BICYCLETOUR' | translate)"></label>
-                    </div>
-                </li>
                 <li>
                     <div class="ui radio checkbox">
                         <input name="orsProfileBicycle" ng-change="$ctrl.changeProfile()" ng-model="$ctrl.currentProfile.type" ng-value="$ctrl.profiles.BicycleMTB.name" type="radio" id="mtb">
@@ -106,7 +94,7 @@
             <i class="fa fa-lg fa-male" ng-class="{active : $ctrl.activeSubgroup === $ctrl.profiles.Pedestrian.name}">
             </i>
         </button>
-        <span>  
+        <span>
             <i class="fa fa-caret-down" style="margin-top: 20px;">
             </i>
             <ul class="ors-nav-submenu">
diff --git a/app/constants/carBrands.js b/app/constants/carBrands.js
new file mode 100644
index 00000000..68763fd4
--- /dev/null
+++ b/app/constants/carBrands.js
@@ -0,0 +1,50 @@
+angular
+  .module("orsApp")
+  .constant("carBrands", [
+    "Abarth",
+    "Alfa Romeo",
+    "Aston Martin",
+    "Audi",
+    "BMW",
+    "Bentley",
+    "Cadillac",
+    "Chevrolet",
+    "Citro\u00ebn",
+    "Dacia",
+    "Ferrari",
+    "Fiat",
+    "Ford",
+    "Honda",
+    "Hyundai",
+    "Infiniti",
+    "Jaguar",
+    "Jeep",
+    "Kia",
+    "Lamborghini",
+    "Land Rover",
+    "Lexus",
+    "Lotus",
+    "Maserati",
+    "Mazda",
+    "McLaren",
+    "Mercedes-Benz",
+    "Mini",
+    "Mitsubishi",
+    "Morgan Motor",
+    "Nissan",
+    "Peugeot",
+    "Porsche",
+    "Renault",
+    "Rolls-Royce",
+    "Seat",
+    "Smart",
+    "SsangYong",
+    "Subaru",
+    "Suzuki",
+    "Tesla",
+    "Toyota",
+    "VW",
+    "Vauxhall",
+    "Volvo",
+    "\u0160koda"
+  ]);
diff --git a/app/constants/carCategories.js b/app/constants/carCategories.js
new file mode 100644
index 00000000..02a3eb18
--- /dev/null
+++ b/app/constants/carCategories.js
@@ -0,0 +1,57 @@
+angular.module("orsApp").constant("carCategories", {
+  a: {
+    de: "Kleinstwagen",
+    en: "mini cars",
+    short: "a"
+  },
+  b: {
+    de: "Kleinwagen",
+    en: "small cars",
+    short: "b"
+  },
+  c: {
+    de: "Mittelklasse",
+    en: "medium cars",
+    short: "c"
+  },
+  d: {
+    de: "Obere Mittelklasse",
+    en: "large cars",
+    short: "d"
+  },
+  e: {
+    de: "Oberklasse",
+    en: "executive cars",
+    short: "e"
+  },
+  f: {
+    de: "Luxusklasse",
+    en: "luxury cars",
+    short: "f"
+  },
+  j: {
+    de: "SUV",
+    en: "SUV",
+    short: "j"
+  },
+  lcv: {
+    de: "Nutzfahrzeuge",
+    en: "Utilities",
+    short: "lcv"
+  },
+  m: {
+    de: "Van",
+    en: "MiniVaN - multi purpose cars",
+    short: "m"
+  },
+  pu: {
+    de: "Pick-up",
+    en: "Pick-up",
+    short: "pu"
+  },
+  s: {
+    de: "Sportwagen",
+    en: "sport coupés",
+    short: "s"
+  }
+});
diff --git a/app/constants/lists.js b/app/constants/lists.js
index 0e3df1a7..f5b46a69 100755
--- a/app/constants/lists.js
+++ b/app/constants/lists.js
@@ -232,34 +232,6 @@ angular.module("orsApp").constant("lists", {
         shortValue: "2"
       }
     },
-    difficulty: {
-      fitness: {
-        "-1": {
-          name: "Unset",
-          value: -1
-        },
-        "0": {
-          name: "Novice",
-          value: 0
-        },
-        "1": {
-          name: "Moderate",
-          value: 1
-        },
-        "2": {
-          name: "Amateur",
-          value: 2
-        },
-        "3": {
-          name: "Pro",
-          value: 3
-        }
-      },
-      steepness: {
-        min: 0,
-        max: 15
-      }
-    },
     borders: {
       all: {
         subgroups: ["Car", "HeavyVehicle"]
@@ -282,14 +254,6 @@ angular.module("orsApp").constant("lists", {
           "Pedestrian"
         ]
       },
-      unpaved: {
-        name: "unpavedroads",
-        subgroups: ["Car", "Bicycle", "HeavyVehicle"]
-      },
-      paved: {
-        name: "pavedroads",
-        subgroups: ["Car", "Bicycle", "HeavyVehicle"]
-      },
       fords: {
         name: "fords",
         subgroups: [
@@ -311,14 +275,6 @@ angular.module("orsApp").constant("lists", {
       tollroads: {
         name: "tollways",
         subgroups: ["Car", "HeavyVehicle"]
-      },
-      tunnels: {
-        name: "tunnels",
-        subgroups: ["Car", "HeavyVehicle"]
-      },
-      tracks: {
-        name: "tracks",
-        subgroups: ["Car", "HeavyVehicle"]
       }
     },
     wheelchair: {
@@ -430,98 +386,6 @@ angular.module("orsApp").constant("lists", {
         value: "axleload"
       }
     },
-    maxspeeds: {
-      Car: {
-        min: 30,
-        max: 300,
-        default: 100,
-        step: 5
-      },
-      Bicycle: {
-        min: 5,
-        max: 50,
-        default: 25,
-        step: 1
-      },
-      BicycleMTB: {
-        min: 5,
-        max: 50,
-        default: 20,
-        step: 1
-      },
-      BicycleRacer: {
-        min: 5,
-        max: 50,
-        default: 30,
-        step: 1
-      },
-      BicycleTour: {
-        min: 5,
-        max: 50,
-        default: 25,
-        step: 1
-      },
-      BicycleSafety: {
-        min: 5,
-        max: 50,
-        default: 20,
-        step: 1
-      },
-      BicycleElectro: {
-        min: 5,
-        max: 50,
-        default: 20,
-        step: 1
-      },
-      Pedestrian: {
-        min: 3,
-        max: 15,
-        default: 6,
-        step: 1
-      },
-      Wheelchair: {
-        min: 5,
-        max: 50,
-        default: 8,
-        step: 1
-      },
-      HeavyVehicle: {
-        min: 30,
-        max: 200,
-        default: 100,
-        step: 5
-      },
-      goods: {
-        min: 30,
-        max: 200,
-        default: 100,
-        step: 5
-      },
-      bus: {
-        min: 30,
-        max: 200,
-        default: 100,
-        step: 5
-      },
-      agricultural: {
-        min: 30,
-        max: 200,
-        default: 100,
-        step: 5
-      },
-      forestry: {
-        min: 30,
-        max: 200,
-        default: 100,
-        step: 5
-      },
-      delivery: {
-        min: 30,
-        max: 200,
-        default: 100,
-        step: 5
-      }
-    },
     green: {
       min: 0.1,
       max: 1
@@ -610,17 +474,7 @@ angular.module("orsApp").constant("lists", {
     }
   },
   permalinkFilters: {
-    avoidables: [
-      "ferry",
-      "unpaved",
-      "paved",
-      "fords",
-      "steps",
-      "highways",
-      "tollroads",
-      "tunnels",
-      "tracks"
-    ],
+    avoidables: ["ferry", "fords", "steps", "highways", "tollroads"],
     analysis: ["method", "isovalue", "isointerval", "reverseflow"],
     Car: ["type", "weight", "maxspeed"],
     hgv: [
@@ -689,60 +543,17 @@ angular.module("orsApp").constant("lists", {
       "axleload",
       "hazmat"
     ],
-    Bicycle: ["type", "weight", "maxspeed", "fitness", "incline", "steepness"],
-    BicycleSafety: [
-      "type",
-      "weight",
-      "maxspeed",
-      "fitness",
-      "incline",
-      "steepness"
-    ],
-    BicycleMTB: [
-      "type",
-      "weight",
-      "maxspeed",
-      "fitness",
-      "incline",
-      "steepness"
-    ],
-    BicycleRacer: [
-      "type",
-      "weight",
-      "maxspeed",
-      "fitness",
-      "incline",
-      "steepness"
-    ],
-    BicycleElectro: [
-      "type",
-      "weight",
-      "maxspeed",
-      "fitness",
-      "incline",
-      "steepness"
-    ],
-    BicycleTour: [
-      "type",
-      "weight",
-      "maxspeed",
-      "fitness",
-      "incline",
-      "steepness"
-    ],
-    Pedestrian: ["type", "weight", "maxspeed", "fitness", "steepness", "green"],
-    PedestrianHiking: [
-      "type",
-      "weight",
-      "maxspeed",
-      "fitness",
-      "steepness",
-      "green"
-    ],
+    Bicycle: ["type", "weight"],
+    BicycleSafety: ["type", "weight"],
+    BicycleMTB: ["type", "weight"],
+    BicycleRacer: ["type", "weight"],
+    BicycleElectro: ["type", "weight"],
+    BicycleTour: ["type", "weight"],
+    Pedestrian: ["type", "weight", "green"],
+    PedestrianHiking: ["type", "weight", "green"],
     Wheelchair: [
       "type",
       "weight",
-      "maxspeed",
       "incline",
       "curb",
       "surface",
@@ -754,15 +565,12 @@ angular.module("orsApp").constant("lists", {
     wps: "a",
     type: "b",
     weight: "c",
-    maxspeed: "d",
     hgvWeight: "f1",
     width: "f2",
     height: "f3",
     axleload: "f4",
     length: "f5",
     hazmat: "f6",
-    fitness: "g1",
-    steepness: "g2",
     surface: "h1",
     incline: "h2",
     curb: "h3",
@@ -774,13 +582,9 @@ angular.module("orsApp").constant("lists", {
     routinglang: "k1",
     units: "k2",
     ferry: "l1",
-    unpaved: "l2",
-    paved: "l3",
     fords: "l4",
     highways: "l5",
     tollroads: "l6",
-    tunnels: "l7",
-    tracks: "l8",
     green: "m1",
     lat: "n1",
     lng: "n2",
diff --git a/app/includes/route-summary.html b/app/includes/route-summary.html
index ab0a23ff..f445206d 100755
--- a/app/includes/route-summary.html
+++ b/app/includes/route-summary.html
@@ -65,6 +65,32 @@
                 <span ng-bind-html="(route.summary.descent | distance)">
                 </span>
             </div>
+            <div class="summary-item" ng-if="route.summary.consumption" tooltip-side="top" tooltip-template="{{('CONSUMPTION' | translate)}}" tooltips="">
+                <span>
+                    <i class="fa fa-tint">
+                    </i>
+                </span>
+                <span ng-bind-html="(route.summary.consumption | round: ' l')">
+                </span>
+            </div>
+        </div>
+        <div>
+            <div class="summary-item" ng-if="route.summary.emission" tooltip-side="top" tooltip-template="{{('EMISSION' | translate)}}" tooltips="">
+                <span>
+                    <i class="fa fa-cloud-upload">
+                    </i>
+                </span>
+                <span ng-bind-html="(route.summary.emission | round: ' kg CO<sub>2</sub>')">
+                </span>
+            </div>
+            <div class="summary-item" ng-if="route.summary.fuelCost" tooltip-side="top" tooltip-template="{{('FUEL_COSTS' | translate)}}" tooltips="">
+                <span>
+                    <i class="fa fa-eur">
+                    </i>
+                </span>
+                <span ng-bind-html="(route.summary.fuelCost | round)">
+                </span>
+            </div>
         </div>
         <button class="summary-select" data-ng-click="$ctrl.setIdx($index); $ctrl.showInstructions();" ng-bind-html="('DETAILS' | translate)" ng-show="!$ctrl.shouldDisplayRouteDetails">
             >
diff --git a/app/includes/settings.html b/app/includes/settings.html
index e36230bd..70c3a016 100755
--- a/app/includes/settings.html
+++ b/app/includes/settings.html
@@ -209,6 +209,12 @@ <h2 ng-bind-html="('DEVELOPER_SETTINGS' | translate)">
                    ng-model-options="{debounce: 500}"
                    ng-change="$ctrl.changeOptions('pois')"
                    style="width: 70%"/>
+            <br>
+            <label ng-bind-html="'Fuel: '"></label>
+            <input data-ng-model="$ctrl.currentOptions.env.fuel"
+                   ng-model-options="{debounce: 500}"
+                   ng-change="$ctrl.changeOptions('fuel')"
+                   style="width: 70%"/>
         </div>
         <div ng-show="$ctrl.api">
             <br>
@@ -224,4 +230,4 @@ <h2 ng-bind-html="('DEVELOPER_SETTINGS' | translate)">
             </label>
         </div>
     </section>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/index.html b/app/index.html
index 0bcd68b7..ae794890 100755
--- a/app/index.html
+++ b/app/index.html
@@ -32,7 +32,7 @@
     <link href="bower_components/leaflet-measure/dist/leaflet-measure.css" rel="stylesheet"></link>
     <link href="bower_components/leaflet.markercluster/dist/MarkerCluster.css" rel="stylesheet"></link>
     <link href="bower_components/leaflet.markercluster/dist/MarkerCluster.Default.css" rel="stylesheet"></link>
-    <link href="bower_components/leaflet-distance-markers/leaflet-distance-marker.css" rel="stylesheet"></link>    
+    <link href="bower_components/leaflet-distance-markers/leaflet-distance-marker.css" rel="stylesheet"></link>
     <!-- endbuild -->
     <!-- these scripts remain unbuilt as they contain relative paths -->
     <link href="bower_components/font-awesome/css/font-awesome.min.css" rel="stylesheet"></link>
@@ -137,6 +137,8 @@
 <script src="constants/namespaces.js"></script>
 <script src="constants/lists.js"></script>
 <script src="constants/countries.js"></script>
+<script src="constants/carBrands.js"></script>
+<script src="constants/carCategories.js"></script>
 <script src="constants/mappings.js"></script>
 <script src="values/globals.js"></script>
 <script src="infrastructure/ors-settings-service.js"></script>
@@ -152,6 +154,7 @@
 <script src="infrastructure/ors-cookies-service.js"></script>
 <script src="infrastructure/ors-importexport-service.js"></script>
 <script src="infrastructure/ors-locations-service.js"></script>
+<script src="infrastructure/ors-fuel-service.js"></script>
 <script src="infrastructure/ors-apikey-factory.js"></script>
 <script src="components/ors-navigation/ors-nav.js"></script>
 <script src="components/ors-panel-routing/ors-panel-routing.js"></script>
diff --git a/app/infrastructure/ors-cookies-service.js b/app/infrastructure/ors-cookies-service.js
index d1c264ba..0741cf8d 100755
--- a/app/infrastructure/ors-cookies-service.js
+++ b/app/infrastructure/ors-cookies-service.js
@@ -63,7 +63,8 @@ angular
             directions: JSON.parse(JSON.stringify(ENV)).directions,
             isochrones: JSON.parse(JSON.stringify(ENV)).isochrones,
             matrix: JSON.parse(JSON.stringify(ENV)).matrix,
-            pois: JSON.parse(JSON.stringify(ENV)).pois
+            pois: JSON.parse(JSON.stringify(ENV)).pois,
+            fuel: JSON.parse(JSON.stringify(ENV)).fuel
           };
         }
         if ("env" in cookieUserOptions) {
@@ -74,7 +75,8 @@ angular
             directions: ENV.directions,
             isochrones: ENV.isochrones,
             matrix: ENV.matrix,
-            pois: ENV.pois
+            pois: ENV.pois,
+            fuel: ENV.fuel
           };
         }
         return {
diff --git a/app/infrastructure/ors-fuel-service.js b/app/infrastructure/ors-fuel-service.js
new file mode 100644
index 00000000..a2cf0ad2
--- /dev/null
+++ b/app/infrastructure/ors-fuel-service.js
@@ -0,0 +1,160 @@
+angular.module("orsApp.fuel-service", []).factory("orsFuelService", [
+  "$q",
+  "$http",
+  "orsUtilsService",
+  "orsMapFactory",
+  "orsObjectsFactory",
+  "lists",
+  "ENV",
+  "orsRouteService",
+  (
+    $q,
+    $http,
+    orsUtilsService,
+    orsMapFactory,
+    orsObjectsFactory,
+    lists,
+    ENV,
+    orsRouteService
+  ) => {
+    let orsFuelService = {};
+    orsFuelService.requests = [];
+    orsFuelService.clear = () => {
+      for (let req of orsFuelService.requests) {
+        if ("cancel" in req) req.cancel("Cancel last request");
+      }
+      orsFuelService.requests = [];
+    };
+    /**
+     *
+     * @param geometry
+     * @param ofsSettings
+     * @returns {{promise: *, cancel: cancel}}
+     */
+    orsFuelService.getConsumption = ofsSettings => {
+      let idx =
+        orsRouteService.getCurrentRouteIdx() === undefined
+          ? 0
+          : orsRouteService.getCurrentRouteIdx();
+      let route;
+      if (
+        angular.isDefined(orsRouteService.data) &&
+        angular.isDefined(orsRouteService.data.routes)
+      ) {
+        if (orsRouteService.data.routes.length > 0) {
+          let data = orsRouteService.data;
+          route = data.routes[idx];
+        }
+      }
+      if (route && route.geometryRaw) {
+        let geometry = {
+          coordinates: route.geometryRaw,
+          type: "LineString"
+        };
+        let parameters = {
+          request: "route"
+        };
+        let url = ENV.fuel;
+        let canceller = $q.defer();
+        let requestData = {
+          request: "route",
+          geometry: {
+            geojson: geometry,
+            filters: ofsSettings.filters
+          }
+        };
+        let cancel = reason => {
+          canceller.resolve(reason);
+        };
+        let promise = $http
+          .post(
+            url,
+            requestData,
+            { params: parameters },
+            {
+              timeout: canceller.promise
+            }
+          )
+          .then(response => {
+            let fuelSubject = null;
+            if (
+              Object.keys(response.data.fuel_stats).length === 1 &&
+              response.data.fuel_stats.individual
+            ) {
+              fuelSubject = response.data.fuel_stats.individual;
+            } else {
+              let category = response.data.general.vehicle_categories[0];
+              fuelSubject = response.data.fuel_stats[category];
+            }
+            fuelSubject.total_cost.price_date = fuelSubject.total_cost.price_date
+              .split("T")[0]
+              .split("-")
+              .reverse()
+              .join(".");
+            if (fuelSubject.category_info.calculation_errors === "No Errors") {
+              route.summary.consumption = fuelSubject.total_consumption.liters;
+              route.summary.emission = fuelSubject.total_emissions.co2_kg;
+              route.summary.fuelCost = fuelSubject.total_cost.w_tax_euro;
+            }
+            route.summary.ofs = response.data;
+            return response.data;
+          });
+      }
+    };
+    orsFuelService.getBrands = () => {
+      let url = ENV.fuel;
+      let canceller = $q.defer();
+      let parameters = {
+        request: "brands",
+        source: "cfd"
+      };
+      let cancel = reason => {
+        canceller.resolve(reason);
+      };
+      let promise = $http
+        .get(
+          url,
+          { params: parameters },
+          {
+            timeout: canceller.promise
+          }
+        )
+        .then(response => {
+          return response.data;
+        });
+      return {
+        promise: promise,
+        cancel: cancel
+      };
+    };
+    orsFuelService.getCars = brand => {
+      let url = ENV.fuel;
+      let canceller = $q.defer();
+      let parameters = {
+        request: "cars",
+        brand: brand,
+        source: "cfd"
+      };
+      let cancel = reason => {
+        canceller.resolve(reason);
+      };
+      let promise = $http
+        .get(
+          url,
+          { params: parameters },
+          {
+            timeout: canceller.promise
+          }
+        )
+        .then(response => {
+          return response.data;
+        });
+      return {
+        promise: promise,
+        cancel: cancel
+      };
+    };
+
+    return orsFuelService;
+  }
+]);
diff --git a/app/infrastructure/ors-request-service.js b/app/infrastructure/ors-request-service.js
index cf05f5aa..a9f86d8e 100755
--- a/app/infrastructure/ors-request-service.js
+++ b/app/infrastructure/ors-request-service.js
@@ -122,7 +122,7 @@ angular.module("orsApp.request-service", []).factory("orsRequestService", [
      * @param {Object} response: response data
      */
     orsRequestService.processResponse = response => {
-      var data = response.data;
+      let data = response.data;
       return data;
     };
     return orsRequestService;
diff --git a/app/infrastructure/ors-settings-service.js b/app/infrastructure/ors-settings-service.js
index 715adefb..2c5714d2 100755
--- a/app/infrastructure/ors-settings-service.js
+++ b/app/infrastructure/ors-settings-service.js
@@ -8,6 +8,7 @@ angular.module("orsApp.settings-service", []).factory("orsSettingsFactory", [
   "orsMessagingService",
   "lists",
   "weathercheck",
+  "orsFuelService",
   (
     $timeout,
     orsObjectsFactory,
@@ -17,7 +18,8 @@ angular.module("orsApp.settings-service", []).factory("orsSettingsFactory", [
     orsAaService,
     orsMessagingService,
     lists,
-    weathercheck
+    weathercheck,
+    orsFuelService
   ) => {
     let orsSettingsFactory = {};
     /** Behaviour subjects routing. */
@@ -86,7 +88,6 @@ angular.module("orsApp.settings-service", []).factory("orsSettingsFactory", [
       return orsSettingsFactory[currentSettingsObj].getValue().profile.options;
     };
     orsSettingsFactory.setActiveOptions = (options, fireRequest) => {
-      console.log(options);
       orsSettingsFactory[
         currentSettingsObj
       ].getValue().profile.options = options;
@@ -239,6 +240,10 @@ angular.module("orsApp.settings-service", []).factory("orsSettingsFactory", [
               orsSettingsFactory.focusIdx,
               settings.profile.options.landmarks
             );
+            let ofsSettings = profile === "Car" ? settings.profile.options.ofs : undefined;
+            if (ofsSettings) {
+              orsFuelService.getConsumption(ofsSettings);
+            }
           },
           function(response) {
             orsSettingsFactory.requestSubject.onNext(false);
diff --git a/app/js/app.js b/app/js/app.js
index 57ae9aa1..5a2ae15d 100755
--- a/app/js/app.js
+++ b/app/js/app.js
@@ -10,9 +10,9 @@
  *|------------------------------------------------------------------------------------*/
 /**
  * @author: Amandus Butzer, amandus@openrouteservice.org, Timothy Ellersiek, timothy@openrouteservice.org
- * @version: 0.3.7
+ * @version: 0.3.8
  */
-(function() {
+(function(searchString, position) {
   fetchData().then(bootstrapApplication);
 
   function fetchData() {
@@ -47,6 +47,7 @@
       "orsApp.map-service",
       "orsApp.objects-service",
       "orsApp.locations-service",
+      "orsApp.fuel-service",
       "orsApp.params-service",
       "orsApp.request-service",
       "orsApp.settings-service",
@@ -97,9 +98,10 @@
               config.url === ENV.isochrones ||
               config.url === ENV.pois ||
               config.url === ENV.matrix ||
-              config.url === ENV.mapsurfer
+              config.url === ENV.mapsurfer ||
+              config.url === ENV.fuel
             ) {
-              config.url = config.url + ak;
+              config.url += ak;
             }
             return config || $q.when(config);
           },
diff --git a/app/js/filters.js b/app/js/filters.js
index d2821392..34f8f4a6 100755
--- a/app/js/filters.js
+++ b/app/js/filters.js
@@ -88,4 +88,18 @@ angular
     return function(array, needle) {
       return array.indexOf(needle) >= 0;
     };
+  })
+  .filter("round", () => {
+    return (input, units = "") => {
+      return "<b>" + input.toFixed(1) + "</b>" + units;
+    };
+  })
+  .filter("capitalize", () => {
+    return str => {
+      str = str.split(" ");
+      for (let i = 0, x = str.length; i < x; i++) {
+        str[i] = str[i][0].toUpperCase() + str[i].substr(1);
+      }
+      return str.join(" ");
+    };
   });
diff --git a/app/languages/de-DE.json b/app/languages/de-DE.json
index d0f0d841..2c3a3433 100755
--- a/app/languages/de-DE.json
+++ b/app/languages/de-DE.json
@@ -55,7 +55,7 @@
     "SURFACE": "Oberfläche",
     "INCLINE": "Anstieg",
     "CURB": "Bordsteinhöhe",
-    "WHEELCHAIR_WIDTH" : "Mindestbreite",
+    "WHEELCHAIR_WIDTH": "Mindestbreite",
     "ISOCHRONES": "Isochronen",
     "ISOCHRONEMETHOD": "Isochronen Methode",
     "TIMEDISTANCE": "Distanz",
@@ -199,6 +199,26 @@
     "INFO_SUPPORT": "Unterstützen Sie openrouteservice.org",
     "INFO_SUPPORT_TEXT": "Openrouteservice bietet kostenlose Dienstleistungen an und ist für einen Großteil seiner Finanzierung auf Spenden angewiesen. Wenn Sie die Weiterentwicklung von Features und Serverinfrastruktur unterstützen möchten, sind Spenden sehr willkommen.",
     "LOCALE_HEIGHTGRAPH": "Höhenprofil",
-    "DEVELOPER_SETTINGS": "Developer Settings",
-    "INCLUDE_INSTRUCTIONS": "Include Instructions"
+    "DEVELOPER_SETTINGS": "Entwickler Optionen",
+    "INCLUDE_INSTRUCTIONS": "Include Instructions",
+    "FUEL_CONSUMPTION": "Kraftstoffverbrauch (experimentell)",
+    "FUEL_TYPE": "Kraftstoffart",
+    "CAR_BRAND": "Auto Marke",
+    "DRIVING_SPEED": "Fahrgeschwindigkeit",
+    "VEHICLE_CATEGORY": "Fahrzeugklasse",
+    "TANK_SIZE": "Tankgröße",
+    "SPECIFIC_FUEL_CONSUMPTION": "Spezifischer Kraftstoffverbrauch",
+    "CAR_MODEL": "Automodell",
+    "CAR_YEAR": "Baujahr",
+    "CAR_TYPE": "Spezieller Typ",
+    "FUEL_COSTS": "Fuel costs",
+    "SEARCH": "Search",
+    "OPTIONAL_PARAMS": "Optional parameters:",
+    "CALC_CONSUMPTION": "Calculate consumption",
+    "_RESET": "Reset",
+    "ON_ROUTE_CHANGE": "on route change",
+    "FUEL_INFO": "At least a vehicle category or a car brand and model need to be specified.",
+    "CONSUMPTION": "Consumption",
+    "EMISSION": "Emission",
+    "_FOR": "For"
 }
\ No newline at end of file
diff --git a/app/languages/en-GB.json b/app/languages/en-GB.json
index a3dc9ae6..d3f0cf53 100755
--- a/app/languages/en-GB.json
+++ b/app/languages/en-GB.json
@@ -55,7 +55,7 @@
     "SURFACE": "Surface",
     "INCLINE": "Incline",
     "CURB": "Curb",
-    "WHEELCHAIR_WIDTH" : "Minimum width",
+    "WHEELCHAIR_WIDTH": "Minimum width",
     "ISOCHRONES": "Isochrones",
     "ISOCHRONEMETHOD": "Isochrone method",
     "TIMEDISTANCE": "Time",
@@ -138,7 +138,7 @@
     "START": "Directions from here",
     "VIA": "Add as via point",
     "CENTER": "Use as center",
-    "WELCOME": "Welcome to Openrouteservice!",
+    "WELCOME": "Welcome to Openrouteservice",
     "WELCOME_MESSAGE": "To add avoidable areas please use the control in the top right of the map. Otherwise feel free to browse through the plethora of options in the left panel. Also check out our new Isochrones functionality in the left menu panel.",
     "EXTRAS": "Additional information",
     "WHATSHERE": "What is here?",
@@ -149,6 +149,7 @@
     "surface": "Surfaces",
     "roadaccessrestrictions": "Road access restrictions",
     "green": "Green index (for Germany only)",
+    "tollways": "Tollways",
     "FROM": "from",
     "TO": "to",
     "SHARE_LINK": "Share link",
@@ -176,6 +177,8 @@
     "noise": "Noise index (for Germany only)",
     "height": "Height",
     "LOCALE_DISTANCE_MARKERS": "Distance markers (km)",
+    "LOCALE_NO_TOLLWAY": "Tollfree roads",
+    "LOCALE_TOLLWAY": "Tollroads ",
     "avgspeed": "Average speed",
     "traildifficulty": "Trail difficulty",
     "EXTRA_INFORMATION": "Extra information",
@@ -197,5 +200,25 @@
     "INFO_SUPPORT_TEXT": "Openrouteservice offers free services and relies on donations for a majority of its funding. If you would like to support the further development of features and server infrastructure donations are very welcome.",
     "LOCALE_HEIGHTGRAPH": "Elevation profile",
     "DEVELOPER_SETTINGS": "Developer Settings",
-    "INCLUDE_INSTRUCTIONS": "Include Instructions"
+    "INCLUDE_INSTRUCTIONS": "Include Instructions",
+    "FUEL_CONSUMPTION": "Fuel consumption (experimental)",
+    "FUEL_TYPE": "Fuel type",
+    "CAR_BRAND": "Car brand",
+    "DRIVING_SPEED": "Driving speed",
+    "VEHICLE_CATEGORY": "Vehicle category",
+    "TANK_SIZE": "Tank size",
+    "SPECIFIC_FUEL_CONSUMPTION": "Specific fuel consumption",
+    "CAR_MODEL": "Car model",
+    "CAR_YEAR": "Construction year",
+    "CAR_TYPE": "Special type",
+    "FUEL_COSTS": "Fuel costs",
+    "SEARCH": "Search",
+    "OPTIONAL_PARAMS": "Optional parameters:",
+    "CALC_CONSUMPTION": "Calculate consumption",
+    "_RESET": "Reset",
+    "ON_ROUTE_CHANGE": "on route change",
+    "FUEL_INFO": "At least a vehicle category or a car brand and model need to be specified.",
+    "CONSUMPTION": "Consumption",
+    "EMISSION": "Emission",
+    "_FOR": "For"
 }
\ No newline at end of file
diff --git a/app/languages/en-US.json b/app/languages/en-US.json
index 8e8f7ef5..d3f0cf53 100755
--- a/app/languages/en-US.json
+++ b/app/languages/en-US.json
@@ -55,8 +55,8 @@
     "SURFACE": "Surface",
     "INCLINE": "Incline",
     "CURB": "Curb",
-    "WHEELCHAIR_WIDTH" : "Minimum width",
-    "ISOCHRONES": "Isochroƒnes",
+    "WHEELCHAIR_WIDTH": "Minimum width",
+    "ISOCHRONES": "Isochrones",
     "ISOCHRONEMETHOD": "Isochrone method",
     "TIMEDISTANCE": "Time",
     "ISOCHRONEINTERVAL": "Interval",
@@ -200,5 +200,25 @@
     "INFO_SUPPORT_TEXT": "Openrouteservice offers free services and relies on donations for a majority of its funding. If you would like to support the further development of features and server infrastructure donations are very welcome.",
     "LOCALE_HEIGHTGRAPH": "Elevation profile",
     "DEVELOPER_SETTINGS": "Developer Settings",
-    "INCLUDE_INSTRUCTIONS": "Include Instructions"
+    "INCLUDE_INSTRUCTIONS": "Include Instructions",
+    "FUEL_CONSUMPTION": "Fuel consumption (experimental)",
+    "FUEL_TYPE": "Fuel type",
+    "CAR_BRAND": "Car brand",
+    "DRIVING_SPEED": "Driving speed",
+    "VEHICLE_CATEGORY": "Vehicle category",
+    "TANK_SIZE": "Tank size",
+    "SPECIFIC_FUEL_CONSUMPTION": "Specific fuel consumption",
+    "CAR_MODEL": "Car model",
+    "CAR_YEAR": "Construction year",
+    "CAR_TYPE": "Special type",
+    "FUEL_COSTS": "Fuel costs",
+    "SEARCH": "Search",
+    "OPTIONAL_PARAMS": "Optional parameters:",
+    "CALC_CONSUMPTION": "Calculate consumption",
+    "_RESET": "Reset",
+    "ON_ROUTE_CHANGE": "on route change",
+    "FUEL_INFO": "At least a vehicle category or a car brand and model need to be specified.",
+    "CONSUMPTION": "Consumption",
+    "EMISSION": "Emission",
+    "_FOR": "For"
 }
\ No newline at end of file
diff --git a/app/languages/es-ES.json b/app/languages/es-ES.json
index 1bd9fd3f..38029d15 100755
--- a/app/languages/es-ES.json
+++ b/app/languages/es-ES.json
@@ -55,7 +55,7 @@
     "SURFACE": "Superficie",
     "INCLINE": "Inclinación",
     "CURB": "Bordillo",
-    "WHEELCHAIR_WIDTH" : "Minimum width",
+    "WHEELCHAIR_WIDTH": "Minimum width",
     "ISOCHRONES": "Isócronas",
     "ISOCHRONEMETHOD": "Metódo para calcular Isócronas",
     "TIMEDISTANCE": "Tiempo de distancia",
@@ -199,5 +199,25 @@
     "INFO_SUPPORT_TEXT": "Openrouteservice offers free services and relies on donations for a majority of its funding. If you would like to support the further development of features and server infrastructure donations are very welcome.",
     "LOCALE_HEIGHTGRAPH": "Elevation profile",
     "DEVELOPER_SETTINGS": "Developer Settings",
-    "INCLUDE_INSTRUCTIONS": "Include Instructions"
+    "INCLUDE_INSTRUCTIONS": "Include Instructions",
+    "FUEL_CONSUMPTION": "Fuel consumption (experimental)",
+    "FUEL_TYPE": "Fuel type",
+    "CAR_BRAND": "Car brand",
+    "DRIVING_SPEED": "Driving speed",
+    "VEHICLE_CATEGORY": "Vehicle category",
+    "TANK_SIZE": "Tank size",
+    "SPECIFIC_FUEL_CONSUMPTION": "Specific fuel consumption",
+    "CAR_MODEL": "Car model",
+    "CAR_YEAR": "Construction year",
+    "CAR_TYPE": "Special type",
+    "FUEL_COSTS": "Fuel costs",
+    "SEARCH": "Search",
+    "OPTIONAL_PARAMS": "Optional parameters:",
+    "CALC_CONSUMPTION": "Calculate consumption",
+    "_RESET": "Reset",
+    "ON_ROUTE_CHANGE": "on route change",
+    "FUEL_INFO": "At least a vehicle category or a car brand and model need to be specified.",
+    "CONSUMPTION": "Consumption",
+    "EMISSION": "Emission",
+    "_FOR": "For"
 }
\ No newline at end of file
diff --git a/app/languages/fr-FR.json b/app/languages/fr-FR.json
index c5be505a..cf580fe9 100755
--- a/app/languages/fr-FR.json
+++ b/app/languages/fr-FR.json
@@ -55,7 +55,7 @@
     "SURFACE": "Surface",
     "INCLINE": "Inclinaison",
     "CURB": "Trottoir",
-    "WHEELCHAIR_WIDTH" : "Minimum width",
+    "WHEELCHAIR_WIDTH": "Minimum width",
     "ISOCHRONES": "Isochrones",
     "ISOCHRONEMETHOD": "Méthode isochrone",
     "TIMEDISTANCE": "Temps",
@@ -199,5 +199,25 @@
     "INFO_SUPPORT_TEXT": "Openrouteservice offers free services and relies on donations for a majority of its funding. If you would like to support the further development of features and server infrastructure donations are very welcome.",
     "LOCALE_HEIGHTGRAPH": "Elevation profile",
     "DEVELOPER_SETTINGS": "Developer Settings",
-    "INCLUDE_INSTRUCTIONS": "Include Instructions"
+    "INCLUDE_INSTRUCTIONS": "Include Instructions",
+    "FUEL_CONSUMPTION": "Fuel consumption (experimental)",
+    "FUEL_TYPE": "Fuel type",
+    "CAR_BRAND": "Car brand",
+    "DRIVING_SPEED": "Driving speed",
+    "VEHICLE_CATEGORY": "Vehicle category",
+    "TANK_SIZE": "Tank size",
+    "SPECIFIC_FUEL_CONSUMPTION": "Specific fuel consumption",
+    "CAR_MODEL": "Car model",
+    "CAR_YEAR": "Construction year",
+    "CAR_TYPE": "Special type",
+    "FUEL_COSTS": "Fuel costs",
+    "SEARCH": "Search",
+    "OPTIONAL_PARAMS": "Optional parameters:",
+    "CALC_CONSUMPTION": "Calculate consumption",
+    "_RESET": "Reset",
+    "ON_ROUTE_CHANGE": "on route change",
+    "FUEL_INFO": "At least a vehicle category or a car brand and model need to be specified.",
+    "CONSUMPTION": "Consumption",
+    "EMISSION": "Emission",
+    "_FOR": "For"
 }
\ No newline at end of file
diff --git a/app/languages/it-IT.json b/app/languages/it-IT.json
index 4e0c43d1..538b400f 100644
--- a/app/languages/it-IT.json
+++ b/app/languages/it-IT.json
@@ -55,7 +55,7 @@
     "SURFACE": "Superficie",
     "INCLINE": "Inclinazione",
     "CURB": "Ostacoli a gradino",
-    "WHEELCHAIR_WIDTH" : "Minimum width",
+    "WHEELCHAIR_WIDTH": "Minimum width",
     "ISOCHRONES": "Isocrone",
     "ISOCHRONEMETHOD": "Metodo iscorone",
     "TIMEDISTANCE": "Tempo",
@@ -200,5 +200,25 @@
     "INFO_SUPPORT_TEXT": "Openrouteservice offers free services and relies on donations for a majority of its funding. If you would like to support the further development of features and server infrastructure donations are very welcome.",
     "LOCALE_HEIGHTGRAPH": "Elevation profile",
     "DEVELOPER_SETTINGS": "Developer Settings",
-    "INCLUDE_INSTRUCTIONS": "Include Instructions"
+    "INCLUDE_INSTRUCTIONS": "Include Instructions",
+    "FUEL_CONSUMPTION": "Fuel consumption (experimental)",
+    "FUEL_TYPE": "Fuel type",
+    "CAR_BRAND": "Car brand",
+    "DRIVING_SPEED": "Driving speed",
+    "VEHICLE_CATEGORY": "Vehicle category",
+    "TANK_SIZE": "Tank size",
+    "SPECIFIC_FUEL_CONSUMPTION": "Specific fuel consumption",
+    "CAR_MODEL": "Car model",
+    "CAR_YEAR": "Construction year",
+    "CAR_TYPE": "Special type",
+    "FUEL_COSTS": "Fuel costs",
+    "SEARCH": "Search",
+    "OPTIONAL_PARAMS": "Optional parameters:",
+    "CALC_CONSUMPTION": "Calculate consumption",
+    "_RESET": "Reset",
+    "ON_ROUTE_CHANGE": "on route change",
+    "FUEL_INFO": "At least a vehicle category or a car brand and model need to be specified.",
+    "CONSUMPTION": "Consumption",
+    "EMISSION": "Emission",
+    "_FOR": "For"
 }
\ No newline at end of file
diff --git a/app/languages/pl-PL.json b/app/languages/pl-PL.json
index 7dcd7b18..bf7f9a8a 100755
--- a/app/languages/pl-PL.json
+++ b/app/languages/pl-PL.json
@@ -55,7 +55,7 @@
     "SURFACE": "Nawierzchnia",
     "INCLINE": "Nachylenie",
     "CURB": "Garb",
-    "WHEELCHAIR_WIDTH" : "Minimum width",
+    "WHEELCHAIR_WIDTH": "Minimum width",
     "ISOCHRONES": "Izochrony",
     "ISOCHRONEMETHOD": "Metoda izochron",
     "TIMEDISTANCE": "Czas",
@@ -199,5 +199,25 @@
     "INFO_SUPPORT_TEXT": "Openrouteservice offers free services and relies on donations for a majority of its funding. If you would like to support the further development of features and server infrastructure donations are very welcome.",
     "LOCALE_HEIGHTGRAPH": "Elevation profile",
     "DEVELOPER_SETTINGS": "Developer Settings",
-    "INCLUDE_INSTRUCTIONS": "Include Instructions"
+    "INCLUDE_INSTRUCTIONS": "Include Instructions",
+    "FUEL_CONSUMPTION": "Fuel consumption (experimental)",
+    "FUEL_TYPE": "Fuel type",
+    "CAR_BRAND": "Car brand",
+    "DRIVING_SPEED": "Driving speed",
+    "VEHICLE_CATEGORY": "Vehicle category",
+    "TANK_SIZE": "Tank size",
+    "SPECIFIC_FUEL_CONSUMPTION": "Specific fuel consumption",
+    "CAR_MODEL": "Car model",
+    "CAR_YEAR": "Construction year",
+    "CAR_TYPE": "Special type",
+    "FUEL_COSTS": "Fuel costs",
+    "SEARCH": "Search",
+    "OPTIONAL_PARAMS": "Optional parameters:",
+    "CALC_CONSUMPTION": "Calculate consumption",
+    "_RESET": "Reset",
+    "ON_ROUTE_CHANGE": "on route change",
+    "FUEL_INFO": "At least a vehicle category or a car brand and model need to be specified.",
+    "CONSUMPTION": "Consumption",
+    "EMISSION": "Emission",
+    "_FOR": "For"
 }
\ No newline at end of file
diff --git a/app/languages/pt-PT.json b/app/languages/pt-PT.json
index 35676d32..32365494 100755
--- a/app/languages/pt-PT.json
+++ b/app/languages/pt-PT.json
@@ -55,7 +55,7 @@
     "SURFACE": "Superfície",
     "INCLINE": "Inclinação",
     "CURB": "Lancil",
-    "WHEELCHAIR_WIDTH" : "Minimum width",
+    "WHEELCHAIR_WIDTH": "Minimum width",
     "ISOCHRONES": "Isocronas",
     "ISOCHRONEMETHOD": "Método para cálculo de Isocronas",
     "TIMEDISTANCE": "Tempo",
@@ -199,5 +199,25 @@
     "INFO_SUPPORT_TEXT": "Openrouteservice offers free services and relies on donations for a majority of its funding. If you would like to support the further development of features and server infrastructure donations are very welcome.",
     "LOCALE_HEIGHTGRAPH": "Elevation profile",
     "DEVELOPER_SETTINGS": "Developer Settings",
-    "INCLUDE_INSTRUCTIONS": "Include Instructions"
+    "INCLUDE_INSTRUCTIONS": "Include Instructions",
+    "FUEL_CONSUMPTION": "Fuel consumption (experimental)",
+    "FUEL_TYPE": "Fuel type",
+    "CAR_BRAND": "Car brand",
+    "DRIVING_SPEED": "Driving speed",
+    "VEHICLE_CATEGORY": "Vehicle category",
+    "TANK_SIZE": "Tank size",
+    "SPECIFIC_FUEL_CONSUMPTION": "Specific fuel consumption",
+    "CAR_MODEL": "Car model",
+    "CAR_YEAR": "Construction year",
+    "CAR_TYPE": "Special type",
+    "FUEL_COSTS": "Fuel costs",
+    "SEARCH": "Search",
+    "OPTIONAL_PARAMS": "Optional parameters:",
+    "CALC_CONSUMPTION": "Calculate consumption",
+    "_RESET": "Reset",
+    "ON_ROUTE_CHANGE": "on route change",
+    "FUEL_INFO": "At least a vehicle category or a car brand and model need to be specified.",
+    "CONSUMPTION": "Consumption",
+    "EMISSION": "Emission",
+    "_FOR": "For"
 }
\ No newline at end of file
diff --git a/app/languages/ru-RU.json b/app/languages/ru-RU.json
index bf7ec450..e5d971ac 100755
--- a/app/languages/ru-RU.json
+++ b/app/languages/ru-RU.json
@@ -55,7 +55,7 @@
     "SURFACE": "Поверхность",
     "INCLINE": "Подъём",
     "CURB": "Бордюр",
-    "WHEELCHAIR_WIDTH" : "Minimum width",
+    "WHEELCHAIR_WIDTH": "Minimum width",
     "ISOCHRONES": "Зоны доступности",
     "ISOCHRONEMETHOD": "Метод расчёта",
     "TIMEDISTANCE": "Время",
@@ -199,5 +199,25 @@
     "INFO_SUPPORT_TEXT": "Openrouteservice offers free services and relies on donations for a majority of its funding. If you would like to support the further development of features and server infrastructure donations are very welcome.",
     "LOCALE_HEIGHTGRAPH": "Elevation profile",
     "DEVELOPER_SETTINGS": "Developer Settings",
-    "INCLUDE_INSTRUCTIONS": "Include Instructions"
+    "INCLUDE_INSTRUCTIONS": "Include Instructions",
+    "FUEL_CONSUMPTION": "Fuel consumption (experimental)",
+    "FUEL_TYPE": "Fuel type",
+    "CAR_BRAND": "Car brand",
+    "DRIVING_SPEED": "Driving speed",
+    "VEHICLE_CATEGORY": "Vehicle category",
+    "TANK_SIZE": "Tank size",
+    "SPECIFIC_FUEL_CONSUMPTION": "Specific fuel consumption",
+    "CAR_MODEL": "Car model",
+    "CAR_YEAR": "Construction year",
+    "CAR_TYPE": "Special type",
+    "FUEL_COSTS": "Fuel costs",
+    "SEARCH": "Search",
+    "OPTIONAL_PARAMS": "Optional parameters:",
+    "CALC_CONSUMPTION": "Calculate consumption",
+    "_RESET": "Reset",
+    "ON_ROUTE_CHANGE": "on route change",
+    "FUEL_INFO": "At least a vehicle category or a car brand and model need to be specified.",
+    "CONSUMPTION": "Consumption",
+    "EMISSION": "Emission",
+    "_FOR": "For"
 }
\ No newline at end of file
diff --git a/app/languages/zh-CN.json b/app/languages/zh-CN.json
index bd146441..de10bca5 100755
--- a/app/languages/zh-CN.json
+++ b/app/languages/zh-CN.json
@@ -55,7 +55,7 @@
     "SURFACE": "路面",
     "INCLINE": "斜坡",
     "CURB": "边道",
-    "WHEELCHAIR_WIDTH" : "Minimum width",
+    "WHEELCHAIR_WIDTH": "Minimum width",
     "ISOCHRONES": "等值线",
     "ISOCHRONEMETHOD": "等值算法",
     "TIMEDISTANCE": "时间",
@@ -199,5 +199,25 @@
     "INFO_SUPPORT_TEXT": "Openrouteservice offers free services and relies on donations for a majority of its funding. If you would like to support the further development of features and server infrastructure donations are very welcome.",
     "LOCALE_HEIGHTGRAPH": "Elevation profile",
     "DEVELOPER_SETTINGS": "Developer Settings",
-    "INCLUDE_INSTRUCTIONS": "Include Instructions"
+    "INCLUDE_INSTRUCTIONS": "Include Instructions",
+    "FUEL_CONSUMPTION": "Fuel consumption (experimental)",
+    "FUEL_TYPE": "Fuel type",
+    "CAR_BRAND": "Car brand",
+    "DRIVING_SPEED": "Driving speed",
+    "VEHICLE_CATEGORY": "Vehicle category",
+    "TANK_SIZE": "Tank size",
+    "SPECIFIC_FUEL_CONSUMPTION": "Specific fuel consumption",
+    "CAR_MODEL": "Car model",
+    "CAR_YEAR": "Construction year",
+    "CAR_TYPE": "Special type",
+    "FUEL_COSTS": "Fuel costs",
+    "SEARCH": "Search",
+    "OPTIONAL_PARAMS": "Optional parameters:",
+    "CALC_CONSUMPTION": "Calculate consumption",
+    "_RESET": "Reset",
+    "ON_ROUTE_CHANGE": "on route change",
+    "FUEL_INFO": "At least a vehicle category or a car brand and model need to be specified.",
+    "CONSUMPTION": "Consumption",
+    "EMISSION": "Emission",
+    "_FOR": "For"
 }
\ No newline at end of file
diff --git a/app/less/ors-common.less b/app/less/ors-common.less
index f0faf3f2..ebdce367 100755
--- a/app/less/ors-common.less
+++ b/app/less/ors-common.less
@@ -1,4 +1,5 @@
 @import 'variables.less';
+
 a {
     transition: color .4s;
     color: #265C83;
@@ -46,7 +47,7 @@ h3, h4, h5 {
 }
 
 span tooltip {
-    box-sizing: initial!important;
+    box-sizing: initial !important;
 }
 
 .ors-controls-button {
@@ -130,6 +131,7 @@ tooltip._multiline {
     display: inline-block;
     text-align: left;
 }
+
 .flright {
     float: right !important;
 }
@@ -181,7 +183,6 @@ tooltip._multiline {
     margin-bottom: 10px !important;
 }
 
-
 /* Semantic ui overrides */
 
 .ui.checkbox, .item {
@@ -205,10 +206,12 @@ label, .label {
         }
     }
 }
+
 .ors-navigation {
     display: flex;
     flex-direction: column;
 }
+
 .ors-summary, .ors-features {
     align-self: start;
     ul {
@@ -218,7 +221,7 @@ label, .label {
 }
 
 .ors-version {
-    margin-top:auto;
+    margin-top: auto;
     padding-bottom: 3px;
     text-align: center;
     font-size: 11px;
@@ -227,7 +230,8 @@ label, .label {
         color: silver;
         &:hover, &:visited, &:active, &:link {
             text-decoration: none;
-        };
+        }
+    ;
         &:hover {
             color: @orsHoverColor;
         }
@@ -272,7 +276,6 @@ button.summary-select {
 //     background-color: rgb(250, 250, 250);
 // }
 
-
 /* options menu */
 
 .ors-options-menu {
@@ -300,6 +303,26 @@ button.summary-select {
     input {
         width: 150px;
     }
+    select {
+        max-width: 150px;
+        white-space: nowrap !important;
+        margin-bottom: 8px;
+    }
+    margin-top : 8px;
+    margin-bottom: 8px;
+}
+
+.ors-select-tooltip {
+    tooltip {
+        padding-top: 9px;
+    }
+    div {
+        float: left;
+    }
+}
+
+.ors-options-label {
+    margin-top: 4px;
 }
 
 .options-box {
@@ -324,7 +347,7 @@ button.summary-select {
 }
 
 .collapsable {
-    
+
     overflow: hidden;
     height: 0;
 }
@@ -360,7 +383,7 @@ button.summary-select {
             cursor: pointer;
             user-select: none;
             border-right: transparent !important;
-            font-family: Arial,Helvetica Neue,Helvetica,sans-serif;
+            font-family: Arial, Helvetica Neue, Helvetica, sans-serif;
             &:focus, &:active {
                 border: 1px solid rgba(34, 36, 38, 0.15) !important;
                 border-right: transparent !important;
@@ -406,6 +429,15 @@ button.summary-select {
     }
 }
 
+.ors-fuel-table {
+    border: thin solid;
+    border-collapse: collapse;
+    .entry {
+        border-top: thin solid;
+        border-right: thin solid;
+
+    }
+}
 
 /* scrollbar */
 
@@ -419,12 +451,12 @@ button.summary-select {
 //     -webkit-box-shadow: 0 0 1px rgba(255, 255, 255, .5);
 // }
 
-/* 
-  Allow angular.js to be loaded in body, hiding cloaked elements until 
-  templates compile.  The !important is important given that there may be 
-  other selectors that are more specific or come later and might alter display.  
+/*
+  Allow angular.js to be loaded in body, hiding cloaked elements until
+  templates compile.  The !important is important given that there may be
+  other selectors that are more specific or come later and might alter display.
  */
 
 [ng\:cloak], [ng-cloak], .ng-cloak {
     display: none !important;
-}
\ No newline at end of file
+}
diff --git a/bower.json b/bower.json
index 4ed0a9eb..4a89525c 100755
--- a/bower.json
+++ b/bower.json
@@ -1,7 +1,7 @@
 {
   "name": "openrouteservice.org",
   "description": "angular version of openrouteservice.org",
-  "version": "0.3.7",
+  "version": "0.3.8",
   "homepage": "http://www.uni-heidelberg.de",
   "license": "MIT",
   "private": true,
diff --git a/package-lock.json b/package-lock.json
index f956a4ff..4dddf20b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "maps.openrouteservice.org",
-  "version": "0.3.7",
+  "version": "0.3.8",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -14,6 +14,43 @@
       "resolved": "https://registry.npmjs.org/@mapbox/geojson-normalize/-/geojson-normalize-0.0.1.tgz",
       "integrity": "sha1-HaHms6et060pkJsw9Dj2BYG3zYA="
     },
+    "@snyk/dep-graph": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@snyk/dep-graph/-/dep-graph-1.4.0.tgz",
+      "integrity": "sha512-dz4Fo4L9sN0Rt8hMe+zMYZ4mAiljtyIeWvujLyCxhIT5iHSlceUYlba5TDsOFuKyuZKkuhVjORWY1oFEuRzCcA==",
+      "requires": {
+        "graphlib": "2.1.7",
+        "lodash": "4.17.11",
+        "source-map-support": "0.5.10",
+        "tslib": "1.9.3"
+      },
+      "dependencies": {
+        "lodash": {
+          "version": "4.17.11",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
+          "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg=="
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
+        },
+        "source-map-support": {
+          "version": "0.5.10",
+          "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.10.tgz",
+          "integrity": "sha512-YfQ3tQFTK/yzlGJuX8pTwa4tifQj4QS2Mj7UegOu8jAz59MqIiMGPXxQhVQiIMNzayuUSF/jEuVnfFF5JqybmQ==",
+          "requires": {
+            "buffer-from": "1.1.1",
+            "source-map": "0.6.1"
+          }
+        }
+      }
+    },
+    "@snyk/gemfile": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@snyk/gemfile/-/gemfile-1.2.0.tgz",
+      "integrity": "sha512-nI7ELxukf7pT4/VraL4iabtNNMz8mUo7EXlqCFld8O5z6mIMLX9llps24iPpaIZOwArkY3FWA+4t+ixyvtTSIA=="
+    },
     "@turf/buffer": {
       "version": "3.14.0",
       "resolved": "https://registry.npmjs.org/@turf/buffer/-/buffer-3.14.0.tgz",
@@ -111,6 +148,11 @@
         "@turf/inside": "3.14.0"
       }
     },
+    "@yarnpkg/lockfile": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz",
+      "integrity": "sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ=="
+    },
     "JSONStream": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.2.tgz",
@@ -163,9 +205,9 @@
       "dev": true
     },
     "agent-base": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.2.0.tgz",
-      "integrity": "sha512-c+R/U5X+2zz2+UCrCFv6odQzJdoqI+YecuhnAJLa1zYaMc13zPfwMwZrr91Pd1DYNo/yPRbiM4WVf9whgwFsIg==",
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.2.1.tgz",
+      "integrity": "sha512-JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg==",
       "requires": {
         "es6-promisify": "5.0.0"
       }
@@ -214,10 +256,47 @@
       "resolved": "https://registry.npmjs.org/angular/-/angular-1.5.11.tgz",
       "integrity": "sha1-jFunOG8VllyazzQp9ogVU6raMNY="
     },
+    "ansi-align": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-2.0.0.tgz",
+      "integrity": "sha1-w2rsy6VjuJzrVW82kPCx2eNUf38=",
+      "requires": {
+        "string-width": "2.1.1"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
+        },
+        "is-fullwidth-code-point": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
+        },
+        "string-width": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+          "requires": {
+            "is-fullwidth-code-point": "2.0.0",
+            "strip-ansi": "4.0.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+          "requires": {
+            "ansi-regex": "3.0.0"
+          }
+        }
+      }
+    },
     "ansi-escapes": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.1.0.tgz",
-      "integrity": "sha512-UgAb8H9D41AQnu/PbWlCofQVcnV4Gs2bBJi9eZPxfU/hgglFh3SMDMENRIqdr7H6XFnXdoknctFByVsCOotTVw=="
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz",
+      "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ=="
     },
     "ansi-regex": {
       "version": "0.2.1",
@@ -382,9 +461,9 @@
       "optional": true
     },
     "ast-types": {
-      "version": "0.11.4",
-      "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.11.4.tgz",
-      "integrity": "sha512-RbY3UMcOcGhc3pOfQ6sliVjt3lqGib9lRjfH1UXJ8YfBFWbcWSJ8jr/VB2W6ulCzTSO/DSnCASqsHYuqa8O7yw=="
+      "version": "0.12.2",
+      "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.12.2.tgz",
+      "integrity": "sha512-8c83xDLJM/dLDyXNLiR6afRRm4dPKN6KAnKqytRK3DBJul9lA+atxdQkNDkSVPdTqea5HiRq3lnnOIZ0MBpvdg=="
     },
     "astw": {
       "version": "2.2.0",
@@ -602,6 +681,80 @@
       "integrity": "sha1-rfU1KcjUrwLvJPuNU0HBQZ0z4vc=",
       "dev": true
     },
+    "boxen": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/boxen/-/boxen-1.3.0.tgz",
+      "integrity": "sha512-TNPjfTr432qx7yOjQyaXm3dSR0MH9vXp7eT1BFSl/C51g+EFnOR9hTg1IreahGBmDNCehscshe45f+C1TBZbLw==",
+      "requires": {
+        "ansi-align": "2.0.0",
+        "camelcase": "4.1.0",
+        "chalk": "2.4.2",
+        "cli-boxes": "1.0.0",
+        "string-width": "2.1.1",
+        "term-size": "1.2.0",
+        "widest-line": "2.0.1"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
+        },
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "requires": {
+            "color-convert": "1.9.1"
+          }
+        },
+        "camelcase": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
+          "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0="
+        },
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "requires": {
+            "ansi-styles": "3.2.1",
+            "escape-string-regexp": "1.0.5",
+            "supports-color": "5.5.0"
+          }
+        },
+        "is-fullwidth-code-point": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
+        },
+        "string-width": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+          "requires": {
+            "is-fullwidth-code-point": "2.0.0",
+            "strip-ansi": "4.0.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+          "requires": {
+            "ansi-regex": "3.0.0"
+          }
+        },
+        "supports-color": {
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+          "requires": {
+            "has-flag": "3.0.0"
+          }
+        }
+      }
+    },
     "brace-expansion": {
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -1384,6 +1537,11 @@
         }
       }
     },
+    "capture-stack-trace": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz",
+      "integrity": "sha512-mYQLZnx5Qt1JgB1WEiMCf2647plpGeQ2NMR/5L0HNZzGQo4fuSPnK+wjfPnKZV0aiJDgzmWqqkV/g7JD+DW0qw=="
+    },
     "caseless": {
       "version": "0.12.0",
       "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
@@ -1487,261 +1645,6 @@
             "node-pre-gyp": "0.10.3"
           },
           "dependencies": {
-            "abbrev": {
-              "version": "0.3.6",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "ansi-regex": {
-              "version": "0.3.6",
-              "bundled": true,
-              "dev": true
-            },
-            "aproba": {
-              "version": "0.3.6",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "are-we-there-yet": {
-              "version": "0.3.6",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "delegates": "^1.0.0",
-                "readable-stream": "^2.0.6"
-              }
-            },
-            "balanced-match": {
-              "version": "0.3.6",
-              "bundled": true,
-              "dev": true
-            },
-            "brace-expansion": {
-              "version": "0.3.6",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "balanced-match": "^1.0.0",
-                "concat-map": "0.0.1"
-              }
-            },
-            "chownr": {
-              "version": "0.3.6",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "code-point-at": {
-              "version": "0.3.6",
-              "bundled": true,
-              "dev": true
-            },
-            "concat-map": {
-              "version": "0.3.6",
-              "bundled": true,
-              "dev": true
-            },
-            "console-control-strings": {
-              "version": "0.3.6",
-              "bundled": true,
-              "dev": true
-            },
-            "core-util-is": {
-              "version": "0.3.6",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "debug": {
-              "version": "0.3.6",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "ms": "2.0.0"
-              }
-            },
-            "deep-extend": {
-              "version": "0.3.6",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "delegates": {
-              "version": "0.3.6",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "detect-libc": {
-              "version": "0.3.6",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "fs-minipass": {
-              "version": "0.3.6",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "minipass": "^2.2.1"
-              }
-            },
-            "fs.realpath": {
-              "version": "0.3.6",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "gauge": {
-              "version": "0.3.6",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "aproba": "^1.0.3",
-                "console-control-strings": "^1.0.0",
-                "has-unicode": "^2.0.0",
-                "object-assign": "^4.1.0",
-                "signal-exit": "^3.0.0",
-                "string-width": "^1.0.1",
-                "strip-ansi": "^3.0.1",
-                "wide-align": "^1.1.0"
-              }
-            },
-            "glob": {
-              "version": "0.3.6",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "fs.realpath": "^1.0.0",
-                "inflight": "^1.0.4",
-                "inherits": "2",
-                "minimatch": "^3.0.4",
-                "once": "^1.3.0",
-                "path-is-absolute": "^1.0.0"
-              }
-            },
-            "has-unicode": {
-              "version": "0.3.6",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "iconv-lite": {
-              "version": "0.3.6",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "safer-buffer": "^2.1.0"
-              }
-            },
-            "ignore-walk": {
-              "version": "0.3.6",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "minimatch": "^3.0.4"
-              }
-            },
-            "inflight": {
-              "version": "0.3.6",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "once": "^1.3.0",
-                "wrappy": "1"
-              }
-            },
-            "inherits": {
-              "version": "0.3.6",
-              "bundled": true,
-              "dev": true
-            },
-            "ini": {
-              "version": "0.3.6",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "is-fullwidth-code-point": {
-              "version": "0.3.6",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "number-is-nan": "^1.0.0"
-              }
-            },
-            "isarray": {
-              "version": "0.3.6",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "minimatch": {
-              "version": "0.3.6",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "brace-expansion": "^1.1.7"
-              }
-            },
-            "minimist": {
-              "version": "0.3.6",
-              "bundled": true,
-              "dev": true
-            },
-            "minipass": {
-              "version": "0.3.6",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "safe-buffer": "^5.1.1",
-                "yallist": "^3.0.0"
-              }
-            },
-            "minizlib": {
-              "version": "0.3.6",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "minipass": "^2.2.1"
-              }
-            },
-            "mkdirp": {
-              "version": "0.3.6",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "minimist": "0.0.8"
-              }
-            },
-            "ms": {
-              "version": "0.3.6",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "needle": {
-              "version": "0.3.6",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "debug": "^2.1.2",
-                "iconv-lite": "^0.4.4",
-                "sax": "^1.2.4"
-              }
-            },
             "node-pre-gyp": {
               "version": "0.10.3",
               "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.10.3.tgz",
@@ -2325,254 +2228,16 @@
                   "dev": true
                 }
               }
-            },
-            "nopt": {
-              "version": "0.3.6",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "abbrev": "1",
-                "osenv": "^0.1.4"
-              }
-            },
-            "npm-bundled": {
-              "version": "0.3.6",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "npm-packlist": {
-              "version": "0.3.6",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "ignore-walk": "^3.0.1",
-                "npm-bundled": "^1.0.1"
-              }
-            },
-            "npmlog": {
-              "version": "0.3.6",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "are-we-there-yet": "~1.1.2",
-                "console-control-strings": "~1.1.0",
-                "gauge": "~2.7.3",
-                "set-blocking": "~2.0.0"
-              }
-            },
-            "number-is-nan": {
-              "version": "0.3.6",
-              "bundled": true,
-              "dev": true
-            },
-            "object-assign": {
-              "version": "0.3.6",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "once": {
-              "version": "0.3.6",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "wrappy": "1"
-              }
-            },
-            "os-homedir": {
-              "version": "0.3.6",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "os-tmpdir": {
-              "version": "0.3.6",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "osenv": {
-              "version": "0.3.6",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "os-homedir": "^1.0.0",
-                "os-tmpdir": "^1.0.0"
-              }
-            },
-            "path-is-absolute": {
-              "version": "0.3.6",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "process-nextick-args": {
-              "version": "0.3.6",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "rc": {
-              "version": "0.3.6",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "deep-extend": "^0.5.1",
-                "ini": "~1.3.0",
-                "minimist": "^1.2.0",
-                "strip-json-comments": "~2.0.1"
-              },
-              "dependencies": {
-                "minimist": {
-                  "version": "0.3.6",
-                  "bundled": true,
-                  "dev": true,
-                  "optional": true
-                }
-              }
-            },
-            "readable-stream": {
-              "version": "0.3.6",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "core-util-is": "~1.0.0",
-                "inherits": "~2.0.3",
-                "isarray": "~1.0.0",
-                "process-nextick-args": "~2.0.0",
-                "safe-buffer": "~5.1.1",
-                "string_decoder": "~1.1.1",
-                "util-deprecate": "~1.0.1"
-              }
-            },
-            "rimraf": {
-              "version": "0.3.6",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "glob": "^7.0.5"
-              }
-            },
-            "safe-buffer": {
-              "version": "0.3.6",
-              "bundled": true,
-              "dev": true
-            },
-            "safer-buffer": {
-              "version": "0.3.6",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "sax": {
-              "version": "0.3.6",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "semver": {
-              "version": "0.3.6",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "set-blocking": {
-              "version": "0.3.6",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "signal-exit": {
-              "version": "0.3.6",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "string-width": {
-              "version": "0.3.6",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "code-point-at": "^1.0.0",
-                "is-fullwidth-code-point": "^1.0.0",
-                "strip-ansi": "^3.0.0"
-              }
-            },
-            "string_decoder": {
-              "version": "0.3.6",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "safe-buffer": "~5.1.0"
-              }
-            },
-            "strip-ansi": {
-              "version": "0.3.6",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "ansi-regex": "^2.0.0"
-              }
-            },
-            "strip-json-comments": {
-              "version": "0.3.6",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "tar": {
-              "version": "0.3.6",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "chownr": "^1.0.1",
-                "fs-minipass": "^1.2.5",
-                "minipass": "^2.2.4",
-                "minizlib": "^1.1.0",
-                "mkdirp": "^0.5.0",
-                "safe-buffer": "^5.1.1",
-                "yallist": "^3.0.2"
-              }
-            },
-            "util-deprecate": {
-              "version": "0.3.6",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            },
-            "wide-align": {
-              "version": "0.3.6",
-              "bundled": true,
-              "dev": true,
-              "optional": true,
-              "requires": {
-                "string-width": "^1.0.2"
-              }
-            },
-            "wrappy": {
-              "version": "0.3.6",
-              "bundled": true,
-              "dev": true
-            },
-            "yallist": {
-              "version": "0.3.6",
-              "bundled": true,
-              "dev": true
             }
           }
         }
       }
     },
+    "ci-info": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-1.6.0.tgz",
+      "integrity": "sha512-vsGdkwSCDpWmP80ncATX7iea5DWQemg1UgCW5J8tqjU3lYw4FBYuj89J0CTVomA7BEfvSZd84GmHko+MxFQU2A=="
+    },
     "cipher-base": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
@@ -2644,6 +2309,11 @@
         }
       }
     },
+    "cli-boxes": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-1.0.0.tgz",
+      "integrity": "sha1-T6kXw+WclKAEzWH47lCdplFocUM="
+    },
     "cli-cursor": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
@@ -2845,17 +2515,17 @@
       "integrity": "sha512-vtv5HtGjcYUgFrXc6Kx747B83MRRVS5R1VTEQoXvuP+kMI+if6uywV0nDGoiydJRy4yk7h9od5Og0kxx4zUXmw==",
       "requires": {
         "dot-prop": "4.2.0",
-        "graceful-fs": "4.1.11",
+        "graceful-fs": "4.1.15",
         "make-dir": "1.3.0",
         "unique-string": "1.0.0",
-        "write-file-atomic": "2.3.0",
+        "write-file-atomic": "2.4.2",
         "xdg-basedir": "3.0.0"
       },
       "dependencies": {
         "graceful-fs": {
-          "version": "4.1.11",
-          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
-          "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg="
+          "version": "4.1.15",
+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz",
+          "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA=="
         }
       }
     },
@@ -3001,6 +2671,14 @@
         "elliptic": "6.4.0"
       }
     },
+    "create-error-class": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz",
+      "integrity": "sha1-Br56vvlHo/FKMP1hBnHUAbyot7Y=",
+      "requires": {
+        "capture-stack-trace": "1.0.1"
+      }
+    },
     "create-hash": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.1.3.tgz",
@@ -3216,6 +2894,11 @@
       "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-0.0.0.tgz",
       "integrity": "sha1-mWedO70EcVb81FDT0B7rkGhpHoM="
     },
+    "deep-extend": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
+      "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA=="
+    },
     "deep-is": {
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
@@ -3231,7 +2914,7 @@
       "resolved": "https://registry.npmjs.org/degenerator/-/degenerator-1.0.4.tgz",
       "integrity": "sha1-/PSQo37OJmRk2cxDGrmMWBnO0JU=",
       "requires": {
-        "ast-types": "0.11.4",
+        "ast-types": "0.12.2",
         "escodegen": "1.3.3",
         "esprima": "3.1.3"
       },
@@ -3302,6 +2985,11 @@
       "integrity": "sha1-p2o+0YVb56ASu4rBbLgPPADcKPA=",
       "dev": true
     },
+    "diff": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.1.tgz",
+      "integrity": "sha512-s2+XdvhPCOF01LRQBC8hf4vhbVmI2CGS5aZnxLJlT5FtdhPCDFq80q++zK2KlrVorVDdL5BOGZ/VfLrVtYNF+Q=="
+    },
     "diffie-hellman": {
       "version": "5.0.2",
       "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.2.tgz",
@@ -3322,6 +3010,14 @@
         "traverse": "0.6.6"
       }
     },
+    "dockerfile-ast": {
+      "version": "0.0.12",
+      "resolved": "https://registry.npmjs.org/dockerfile-ast/-/dockerfile-ast-0.0.12.tgz",
+      "integrity": "sha512-cIV8oXkAxpIuN5XgG0TGg07nLDgrj4olkfrdT77OTA3VypscsYHBUg/FjHxW9K3oA+CyH4Th/qtoMgTVpzSobw==",
+      "requires": {
+        "vscode-languageserver-types": "3.14.0"
+      }
+    },
     "dom-serializer": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz",
@@ -3401,6 +3097,11 @@
         "readable-stream": "2.3.4"
       }
     },
+    "duplexer3": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz",
+      "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI="
+    },
     "each-async": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/each-async/-/each-async-1.1.1.tgz",
@@ -3549,13 +3250,13 @@
       "resolved": "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz",
       "integrity": "sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=",
       "requires": {
-        "es6-promise": "4.2.4"
+        "es6-promise": "4.2.6"
       },
       "dependencies": {
         "es6-promise": {
-          "version": "4.2.4",
-          "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.4.tgz",
-          "integrity": "sha512-/NdNZVJg+uZgtm9eS3O6lrOLYmQag2DjdEXuPaHlZ6RuVqgqaVZfgYCepEIKsLqwdQArOPtC3XzRLqGGfT8KQQ=="
+          "version": "4.2.6",
+          "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.6.tgz",
+          "integrity": "sha512-aRVgGdnmW2OiySVPUC9e6m+plolMAJKjZnQlCwNSuK5yQ0JN61DZSO1X1Ufd1foqWRAlig0rhduTCHe7sVtK5Q=="
         }
       }
     },
@@ -3639,6 +3340,42 @@
         "safe-buffer": "5.1.1"
       }
     },
+    "execa": {
+      "version": "0.10.0",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-0.10.0.tgz",
+      "integrity": "sha512-7XOMnz8Ynx1gGo/3hyV9loYNPWM94jG3+3T3Y8tsfSstFmETmENCMU/A/zj8Lyaj1lkgEepKepvd6240tBRvlw==",
+      "requires": {
+        "cross-spawn": "6.0.5",
+        "get-stream": "3.0.0",
+        "is-stream": "1.1.0",
+        "npm-run-path": "2.0.2",
+        "p-finally": "1.0.0",
+        "signal-exit": "3.0.2",
+        "strip-eof": "1.0.0"
+      },
+      "dependencies": {
+        "cross-spawn": {
+          "version": "6.0.5",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
+          "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+          "requires": {
+            "nice-try": "1.0.5",
+            "path-key": "2.0.1",
+            "semver": "5.5.0",
+            "shebang-command": "1.2.0",
+            "which": "1.3.1"
+          }
+        },
+        "which": {
+          "version": "1.3.1",
+          "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+          "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+          "requires": {
+            "isexe": "2.0.0"
+          }
+        }
+      }
+    },
     "exit": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
@@ -3674,14 +3411,14 @@
       "integrity": "sha512-bSn6gvGxKt+b7+6TKEv1ZycHleA7aHhRHyAqJyp5pbUFuYYNIzpZnQDk7AsYckyWdEnTeAnay0aCy2aV6iTk9A==",
       "requires": {
         "chardet": "0.4.2",
-        "iconv-lite": "0.4.23",
+        "iconv-lite": "0.4.24",
         "tmp": "0.0.33"
       },
       "dependencies": {
         "iconv-lite": {
-          "version": "0.4.23",
-          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz",
-          "integrity": "sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==",
+          "version": "0.4.24",
+          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+          "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
           "requires": {
             "safer-buffer": "2.1.2"
           }
@@ -3994,6 +3731,11 @@
       "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=",
       "dev": true
     },
+    "get-stream": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
+      "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ="
+    },
     "get-uri": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/get-uri/-/get-uri-2.0.2.tgz",
@@ -4064,6 +3806,14 @@
         "is-glob": "2.0.1"
       }
     },
+    "global-dirs": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-0.1.1.tgz",
+      "integrity": "sha1-sxnA3UYH81PzvpzKTHL8FIxJ9EU=",
+      "requires": {
+        "ini": "1.3.5"
+      }
+    },
     "globule": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/globule/-/globule-1.2.1.tgz",
@@ -4081,6 +3831,24 @@
         }
       }
     },
+    "got": {
+      "version": "6.7.1",
+      "resolved": "https://registry.npmjs.org/got/-/got-6.7.1.tgz",
+      "integrity": "sha1-JAzQV4WpoY5WHcG0S0HHY+8ejbA=",
+      "requires": {
+        "create-error-class": "3.0.2",
+        "duplexer3": "0.1.4",
+        "get-stream": "3.0.0",
+        "is-redirect": "1.0.0",
+        "is-retry-allowed": "1.1.0",
+        "is-stream": "1.1.0",
+        "lowercase-keys": "1.0.1",
+        "safe-buffer": "5.1.1",
+        "timed-out": "4.0.1",
+        "unzip-response": "2.0.1",
+        "url-parse-lax": "1.0.0"
+      }
+    },
     "graceful-fs": {
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz",
@@ -4094,17 +3862,17 @@
       "dev": true
     },
     "graphlib": {
-      "version": "2.1.5",
-      "resolved": "https://registry.npmjs.org/graphlib/-/graphlib-2.1.5.tgz",
-      "integrity": "sha512-XvtbqCcw+EM5SqQrIetIKKD+uZVNQtDPD1goIg7K73RuRZtVI5rYMdcCVSHm/AS1sCBZ7vt0p5WgXouucHQaOA==",
+      "version": "2.1.7",
+      "resolved": "https://registry.npmjs.org/graphlib/-/graphlib-2.1.7.tgz",
+      "integrity": "sha512-TyI9jIy2J4j0qgPmOOrHTCtpPqJGN/aurBwc6ZT+bRii+di1I+Wv3obRhVrmBEXet+qkMaEX67dXrwsd3QQM6w==",
       "requires": {
-        "lodash": "4.17.10"
+        "lodash": "4.17.11"
       },
       "dependencies": {
         "lodash": {
-          "version": "4.17.10",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz",
-          "integrity": "sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg=="
+          "version": "4.17.11",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
+          "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg=="
         }
       }
     },
@@ -5463,14 +5231,6 @@
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
       "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
     },
-    "hasbin": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/hasbin/-/hasbin-1.2.3.tgz",
-      "integrity": "sha1-eMWSaJPIAhXCtWiuH9P8q3omlrA=",
-      "requires": {
-        "async": "1.5.2"
-      }
-    },
     "hash-base": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-2.0.2.tgz",
@@ -5542,7 +5302,8 @@
     "hosted-git-info": {
       "version": "2.5.0",
       "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz",
-      "integrity": "sha1-bWDjSzq7yDEwYsO3mO+NkBoHrzw="
+      "integrity": "sha1-bWDjSzq7yDEwYsO3mO+NkBoHrzw=",
+      "dev": true
     },
     "html-minifier": {
       "version": "2.1.7",
@@ -5696,7 +5457,7 @@
       "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz",
       "integrity": "sha512-qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg==",
       "requires": {
-        "agent-base": "4.2.0",
+        "agent-base": "4.2.1",
         "debug": "3.1.0"
       },
       "dependencies": {
@@ -5738,17 +5499,22 @@
       "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.1.tgz",
       "integrity": "sha512-HPCTS1LW51bcyMYbxUIOO4HEOlQ1/1qRaFWcyxvwaqUS9TY88aoEuHUY33kuAh1YhVVaDQhLZsnPd+XNARWZlQ==",
       "requires": {
-        "agent-base": "4.2.0",
-        "debug": "3.1.0"
+        "agent-base": "4.2.1",
+        "debug": "3.2.6"
       },
       "dependencies": {
         "debug": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "version": "3.2.6",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
           "requires": {
-            "ms": "2.0.0"
+            "ms": "2.1.1"
           }
+        },
+        "ms": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="
         }
       }
     },
@@ -5769,12 +5535,22 @@
       "dev": true,
       "optional": true
     },
+    "immediate": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz",
+      "integrity": "sha1-nbHb0Pr43m++D13V5Wu2BigN5ps="
+    },
     "immutable": {
       "version": "3.8.2",
       "resolved": "https://registry.npmjs.org/immutable/-/immutable-3.8.2.tgz",
       "integrity": "sha1-wkOZUUVbs5kT2vKBN28VMOEErfM=",
       "dev": true
     },
+    "import-lazy": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz",
+      "integrity": "sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM="
+    },
     "imurmurhash": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
@@ -5826,13 +5602,13 @@
       "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-3.3.0.tgz",
       "integrity": "sha512-h+xtnyk4EwKvFWHrUYsWErEVR+igKtLdchu+o0Z1RL7VU/jVMFbYir2bp6bAj8efFNxWqHX0dIss6fJQ+/+qeQ==",
       "requires": {
-        "ansi-escapes": "3.1.0",
-        "chalk": "2.4.1",
+        "ansi-escapes": "3.2.0",
+        "chalk": "2.4.2",
         "cli-cursor": "2.1.0",
         "cli-width": "2.2.0",
         "external-editor": "2.2.0",
         "figures": "2.0.0",
-        "lodash": "4.17.10",
+        "lodash": "4.17.11",
         "mute-stream": "0.0.7",
         "run-async": "2.3.0",
         "rx-lite": "4.0.8",
@@ -5856,13 +5632,13 @@
           }
         },
         "chalk": {
-          "version": "2.4.1",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
-          "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
           "requires": {
             "ansi-styles": "3.2.1",
             "escape-string-regexp": "1.0.5",
-            "supports-color": "5.4.0"
+            "supports-color": "5.5.0"
           }
         },
         "figures": {
@@ -5879,9 +5655,9 @@
           "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
         },
         "lodash": {
-          "version": "4.17.10",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz",
-          "integrity": "sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg=="
+          "version": "4.17.11",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
+          "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg=="
         },
         "string-width": {
           "version": "2.1.1",
@@ -5901,9 +5677,9 @@
           }
         },
         "supports-color": {
-          "version": "5.4.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
-          "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
           "requires": {
             "has-flag": "3.0.0"
           }
@@ -5977,6 +5753,14 @@
         "builtin-modules": "1.1.1"
       }
     },
+    "is-ci": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-1.2.1.tgz",
+      "integrity": "sha512-s6tfsaQaQi3JNciBH6shVqEDvhGut0SUXr31ag8Pd8BBbVVlcGfWhpPmEOoM6RJ5TFhbypvf5yyRw/VXW1IiWg==",
+      "requires": {
+        "ci-info": "1.6.0"
+      }
+    },
     "is-dotfile": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz",
@@ -6029,6 +5813,15 @@
         "is-extglob": "1.0.0"
       }
     },
+    "is-installed-globally": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.1.0.tgz",
+      "integrity": "sha1-Df2Y9akRFxbdU13aZJL2e/PSWoA=",
+      "requires": {
+        "global-dirs": "0.1.1",
+        "is-path-inside": "1.0.1"
+      }
+    },
     "is-lower-case": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/is-lower-case/-/is-lower-case-1.1.3.tgz",
@@ -6038,6 +5831,11 @@
         "lower-case": "1.1.4"
       }
     },
+    "is-npm": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-1.0.0.tgz",
+      "integrity": "sha1-8vtjpl5JBbQGyGBydloaTceTufQ="
+    },
     "is-number": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz",
@@ -6061,6 +5859,14 @@
       "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
       "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8="
     },
+    "is-path-inside": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz",
+      "integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=",
+      "requires": {
+        "path-is-inside": "1.0.2"
+      }
+    },
     "is-plain-object": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
@@ -6093,6 +5899,21 @@
       "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz",
       "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o="
     },
+    "is-redirect": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz",
+      "integrity": "sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ="
+    },
+    "is-retry-allowed": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz",
+      "integrity": "sha1-EaBgVotnM5REAz0BJaYaINVk+zQ="
+    },
+    "is-stream": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
+      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ="
+    },
     "is-typedarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
@@ -6128,8 +5949,7 @@
     "isexe": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
-      "dev": true
+      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
     },
     "isobject": {
       "version": "2.1.0",
@@ -6337,6 +6157,41 @@
       "resolved": "https://registry.npmjs.org/jsts/-/jsts-1.3.0.tgz",
       "integrity": "sha1-6Tp2+XrJvafUYl2dZHDw1grIDkU="
     },
+    "jszip": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.2.0.tgz",
+      "integrity": "sha512-4WjbsaEtBK/DHeDZOPiPw5nzSGLDEDDreFRDEgnoMwmknPjTqa+23XuYFk6NiGbeiAeZCctiQ/X/z0lQBmDVOQ==",
+      "requires": {
+        "lie": "3.3.0",
+        "pako": "1.0.6",
+        "readable-stream": "2.3.6",
+        "set-immediate-shim": "1.0.1"
+      },
+      "dependencies": {
+        "readable-stream": {
+          "version": "2.3.6",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+          "requires": {
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "1.0.0",
+            "process-nextick-args": "2.0.0",
+            "safe-buffer": "5.1.1",
+            "string_decoder": "1.1.1",
+            "util-deprecate": "1.0.2"
+          }
+        },
+        "string_decoder": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+          "requires": {
+            "safe-buffer": "5.1.1"
+          }
+        }
+      }
+    },
     "jxon": {
       "version": "2.0.0-beta.5",
       "resolved": "https://registry.npmjs.org/jxon/-/jxon-2.0.0-beta.5.tgz",
@@ -6387,6 +6242,14 @@
         }
       }
     },
+    "latest-version": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-3.1.0.tgz",
+      "integrity": "sha1-ogU4P+oyKzO1rjsYq+4NwvNW7hU=",
+      "requires": {
+        "package-json": "4.0.1"
+      }
+    },
     "lazy-cache": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz",
@@ -6499,6 +6362,14 @@
         "astw": "2.2.0"
       }
     },
+    "lie": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/lie/-/lie-3.3.0.tgz",
+      "integrity": "sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==",
+      "requires": {
+        "immediate": "3.0.6"
+      }
+    },
     "limiter": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/limiter/-/limiter-1.1.2.tgz",
@@ -6580,6 +6451,11 @@
       "resolved": "https://registry.npmjs.org/lodash.assignin/-/lodash.assignin-4.2.0.tgz",
       "integrity": "sha1-uo31+4QesKPoBEIysOJjqNxqKKI="
     },
+    "lodash.clone": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.clone/-/lodash.clone-4.5.0.tgz",
+      "integrity": "sha1-GVhwRQ9aExkkeN9Lw9I9LeoZB7Y="
+    },
     "lodash.clonedeep": {
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
@@ -6642,15 +6518,20 @@
         "lower-case": "1.1.4"
       }
     },
+    "lowercase-keys": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz",
+      "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA=="
+    },
     "lru-cache": {
       "version": "2.7.3",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz",
       "integrity": "sha1-bUUk6LlV+V1PW1iFHOId1y+06VI="
     },
     "macos-release": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/macos-release/-/macos-release-1.1.0.tgz",
-      "integrity": "sha512-mmLbumEYMi5nXReB9js3WGsB8UE6cDBWyIO62Z4DNx6GbRhDxHNjA1MlzSpJ2S2KM1wyiPRA0d19uHWYYvMHjA=="
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/macos-release/-/macos-release-2.0.0.tgz",
+      "integrity": "sha512-iCM3ZGeqIzlrH7KxYK+fphlJpCCczyHXc+HhRVbEu9uNTCrzYJjvvtefzeKTCVHd5AP/aD/fzC80JZ4ZP+dQ/A=="
     },
     "magic-string": {
       "version": "0.22.5",
@@ -7055,9 +6936,9 @@
       }
     },
     "needle": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/needle/-/needle-2.2.1.tgz",
-      "integrity": "sha512-t/ZswCM9JTWjAdXS9VpvqhI2Ct2sL2MdY4fUXqGJaGBk13ge99ObqRksRTbBE56K+wxUXwwfZYOuZHifFW9q+Q==",
+      "version": "2.2.4",
+      "resolved": "https://registry.npmjs.org/needle/-/needle-2.2.4.tgz",
+      "integrity": "sha512-HyoqEb4wr/rsoaIDfTH2aVL9nWtQqba2/HvMv+++m8u0dz808MaagKILxtfeSN7QU7nvbQ79zk3vYOJp9zsNEA==",
       "requires": {
         "debug": "2.6.9",
         "iconv-lite": "0.4.13",
@@ -7075,6 +6956,11 @@
       "resolved": "https://registry.npmjs.org/netmask/-/netmask-1.0.6.tgz",
       "integrity": "sha1-ICl+idhvb2QA8lDZ9Pa0wZRfzTU="
     },
+    "nice-try": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
+      "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="
+    },
     "no-case": {
       "version": "2.3.2",
       "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz",
@@ -7113,6 +6999,14 @@
         "remove-trailing-separator": "1.1.0"
       }
     },
+    "npm-run-path": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
+      "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
+      "requires": {
+        "path-key": "2.0.1"
+      }
+    },
     "number-is-nan": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
@@ -7265,12 +7159,12 @@
       }
     },
     "os-name": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/os-name/-/os-name-2.0.1.tgz",
-      "integrity": "sha1-uaOGNhwXrjohc27wWZQFyajF3F4=",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/os-name/-/os-name-3.0.0.tgz",
+      "integrity": "sha512-7c74tib2FsdFbQ3W+qj8Tyd1R3Z6tuVRNNxXjJcZ4NgjIEQU9N/prVMqcW29XZPXGACqaXN3jq58/6hoaoXH6g==",
       "requires": {
-        "macos-release": "1.1.0",
-        "win-release": "1.1.1"
+        "macos-release": "2.0.0",
+        "windows-release": "3.1.0"
       }
     },
     "os-tmpdir": {
@@ -7287,13 +7181,18 @@
         "shell-quote": "1.6.1"
       }
     },
+    "p-finally": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
+      "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4="
+    },
     "pac-proxy-agent": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-2.0.2.tgz",
       "integrity": "sha512-cDNAN1Ehjbf5EHkNY5qnRhGPUCp6SnpyVof5fRzN800QV1Y2OkzbH9rmjZkbBRa8igof903yOnjIl6z0SlAhxA==",
       "requires": {
-        "agent-base": "4.2.0",
-        "debug": "3.1.0",
+        "agent-base": "4.2.1",
+        "debug": "3.2.6",
         "get-uri": "2.0.2",
         "http-proxy-agent": "2.1.0",
         "https-proxy-agent": "2.2.1",
@@ -7303,12 +7202,17 @@
       },
       "dependencies": {
         "debug": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "version": "3.2.6",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
           "requires": {
-            "ms": "2.0.0"
+            "ms": "2.1.1"
           }
+        },
+        "ms": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="
         }
       }
     },
@@ -7324,6 +7228,17 @@
         "thunkify": "2.1.2"
       }
     },
+    "package-json": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/package-json/-/package-json-4.0.1.tgz",
+      "integrity": "sha1-iGmgQBJTZhxMTKPabCEh7VVfXu0=",
+      "requires": {
+        "got": "6.7.1",
+        "registry-auth-token": "3.3.2",
+        "registry-url": "3.1.0",
+        "semver": "5.5.0"
+      }
+    },
     "pako": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.6.tgz",
@@ -7425,15 +7340,6 @@
         "upper-case-first": "1.1.2"
       }
     },
-    "path": {
-      "version": "0.12.7",
-      "resolved": "https://registry.npmjs.org/path/-/path-0.12.7.tgz",
-      "integrity": "sha1-1NwqUGxM4hl+tIHr/NWzbAFAsQ8=",
-      "requires": {
-        "process": "0.11.10",
-        "util": "0.10.3"
-      }
-    },
     "path-browserify": {
       "version": "0.0.0",
       "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz",
@@ -7462,9 +7368,19 @@
       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
       "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
     },
-    "path-parse": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz",
+    "path-is-inside": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
+      "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM="
+    },
+    "path-key": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
+      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A="
+    },
+    "path-parse": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz",
       "integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME="
     },
     "path-platform": {
@@ -7565,6 +7481,11 @@
       "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
       "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ="
     },
+    "prepend-http": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz",
+      "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw="
+    },
     "preprocess": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/preprocess/-/preprocess-3.1.0.tgz",
@@ -7626,36 +7547,41 @@
       }
     },
     "proxy-agent": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-3.0.0.tgz",
-      "integrity": "sha512-g6n6vnk8fRf705ShN+FEXFG/SDJaW++lSs0d9KaJh4uBWW/wi7en4Cpo5VYQW3SZzAE121lhB/KLQrbURoubZw==",
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-2.3.1.tgz",
+      "integrity": "sha512-CNKuhC1jVtm8KJYFTS2ZRO71VCBx3QSA92So/e6NrY6GoJonkx3Irnk4047EsCcswczwqAekRj3s8qLRGahSKg==",
       "requires": {
-        "agent-base": "4.2.0",
-        "debug": "3.1.0",
+        "agent-base": "4.2.1",
+        "debug": "3.2.6",
         "http-proxy-agent": "2.1.0",
         "https-proxy-agent": "2.2.1",
-        "lru-cache": "4.1.3",
+        "lru-cache": "4.1.5",
         "pac-proxy-agent": "2.0.2",
         "proxy-from-env": "1.0.0",
         "socks-proxy-agent": "3.0.1"
       },
       "dependencies": {
         "debug": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "version": "3.2.6",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
           "requires": {
-            "ms": "2.0.0"
+            "ms": "2.1.1"
           }
         },
         "lru-cache": {
-          "version": "4.1.3",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.3.tgz",
-          "integrity": "sha512-fFEhvcgzuIoJVUF8fYr5KR0YqxD238zgObTps31YdADwPPAp82a4M8TrckkWyx7ekNlf9aBcVn81cFwwXngrJA==",
+          "version": "4.1.5",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
+          "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
           "requires": {
             "pseudomap": "1.0.2",
             "yallist": "2.1.2"
           }
+        },
+        "ms": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="
         }
       }
     },
@@ -7819,6 +7745,24 @@
         }
       }
     },
+    "rc": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
+      "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
+      "requires": {
+        "deep-extend": "0.6.0",
+        "ini": "1.3.5",
+        "minimist": "1.2.0",
+        "strip-json-comments": "2.0.1"
+      },
+      "dependencies": {
+        "strip-json-comments": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
+          "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo="
+        }
+      }
+    },
     "read-only-stream": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/read-only-stream/-/read-only-stream-2.0.0.tgz",
@@ -7909,6 +7853,23 @@
         "is-equal-shallow": "0.1.3"
       }
     },
+    "registry-auth-token": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.3.2.tgz",
+      "integrity": "sha512-JL39c60XlzCVgNrO+qq68FoNb56w/m7JYvGR2jT5iR1xBrUA3Mfx5Twk5rqTThPmQKMWydGmq8oFtDlxfrmxnQ==",
+      "requires": {
+        "rc": "1.2.8",
+        "safe-buffer": "5.1.1"
+      }
+    },
+    "registry-url": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/registry-url/-/registry-url-3.1.0.tgz",
+      "integrity": "sha1-PU74cPc93h138M+aOBQyRE4XSUI=",
+      "requires": {
+        "rc": "1.2.8"
+      }
+    },
     "relateurl": {
       "version": "0.2.7",
       "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz",
@@ -8264,6 +8225,14 @@
       "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz",
       "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA=="
     },
+    "semver-diff": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/semver-diff/-/semver-diff-2.1.0.tgz",
+      "integrity": "sha1-S7uEN8jTfksM8aaP1ybsbWRdbTY=",
+      "requires": {
+        "semver": "5.5.0"
+      }
+    },
     "send": {
       "version": "0.16.2",
       "resolved": "https://registry.npmjs.org/send/-/send-0.16.2.tgz",
@@ -8383,8 +8352,7 @@
     "set-immediate-shim": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz",
-      "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=",
-      "dev": true
+      "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E="
     },
     "sexagesimal": {
       "version": "0.5.0",
@@ -8470,6 +8438,19 @@
         "sha.js": "2.4.10"
       }
     },
+    "shebang-command": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
+      "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
+      "requires": {
+        "shebang-regex": "1.0.0"
+      }
+    },
+    "shebang-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
+      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM="
+    },
     "shell-quote": {
       "version": "1.6.1",
       "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.6.1.tgz",
@@ -8532,43 +8513,49 @@
       }
     },
     "snyk": {
-      "version": "1.82.0",
-      "resolved": "https://registry.npmjs.org/snyk/-/snyk-1.82.0.tgz",
-      "integrity": "sha512-UZuGBdh3PSK6Va9Sos+hFUnLImIShluHfOSvF3UdM0jmjOaIRvIywkUrqT7J38xQ0VRmbVCoJlrYA1g7vD1CeA==",
+      "version": "1.135.1",
+      "resolved": "https://registry.npmjs.org/snyk/-/snyk-1.135.1.tgz",
+      "integrity": "sha512-xHljRnMb7gtqy42tVTWhuSJKVooLXrc08s1zPiBAssvME8GZXIUb0bs+DHmsE5MjoY3CyuTLbdmbSNUGJGS4QA==",
       "requires": {
+        "@snyk/dep-graph": "1.4.0",
+        "@snyk/gemfile": "1.2.0",
         "abbrev": "1.1.1",
-        "ansi-escapes": "3.1.0",
-        "chalk": "2.4.1",
+        "ansi-escapes": "3.2.0",
+        "chalk": "2.4.2",
         "configstore": "3.1.2",
-        "debug": "3.1.0",
-        "hasbin": "1.2.3",
+        "debug": "3.2.6",
+        "diff": "4.0.1",
+        "get-uri": "2.0.2",
         "inquirer": "3.3.0",
-        "lodash": "4.17.10",
-        "needle": "2.2.1",
-        "opn": "5.3.0",
-        "os-name": "2.0.1",
-        "proxy-agent": "3.0.0",
+        "lodash": "4.17.11",
+        "needle": "2.2.4",
+        "opn": "5.4.0",
+        "os-name": "3.0.0",
+        "proxy-agent": "2.3.1",
         "proxy-from-env": "1.0.0",
         "recursive-readdir": "2.2.2",
-        "semver": "5.5.0",
-        "snyk-config": "2.1.0",
-        "snyk-go-plugin": "1.5.1",
-        "snyk-gradle-plugin": "1.3.0",
-        "snyk-module": "1.8.2",
-        "snyk-mvn-plugin": "1.2.0",
-        "snyk-nuget-plugin": "1.6.2",
-        "snyk-php-plugin": "1.5.1",
-        "snyk-policy": "1.12.0",
-        "snyk-python-plugin": "1.6.1",
+        "semver": "5.6.0",
+        "snyk-config": "2.2.1",
+        "snyk-docker-plugin": "1.22.0",
+        "snyk-go-plugin": "1.6.1",
+        "snyk-gradle-plugin": "2.1.3",
+        "snyk-module": "1.9.1",
+        "snyk-mvn-plugin": "2.0.1",
+        "snyk-nodejs-lockfile-parser": "1.11.0",
+        "snyk-nuget-plugin": "1.7.2",
+        "snyk-php-plugin": "1.5.2",
+        "snyk-policy": "1.13.3",
+        "snyk-python-plugin": "1.9.1",
         "snyk-resolve": "1.0.1",
-        "snyk-resolve-deps": "3.1.0",
-        "snyk-sbt-plugin": "1.3.0",
+        "snyk-resolve-deps": "4.0.2",
+        "snyk-sbt-plugin": "2.0.1",
         "snyk-tree": "1.0.0",
-        "snyk-try-require": "1.3.0",
+        "snyk-try-require": "1.3.1",
+        "source-map-support": "0.5.10",
         "tempfile": "2.0.0",
         "then-fs": "2.0.0",
-        "undefsafe": "2.0.2",
-        "uuid": "3.2.1"
+        "update-notifier": "2.5.0",
+        "uuid": "3.3.2"
       },
       "dependencies": {
         "ansi-styles": {
@@ -8580,177 +8567,309 @@
           }
         },
         "chalk": {
-          "version": "2.4.1",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
-          "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
           "requires": {
             "ansi-styles": "3.2.1",
             "escape-string-regexp": "1.0.5",
-            "supports-color": "5.4.0"
+            "supports-color": "5.5.0"
           }
         },
         "debug": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "version": "3.2.6",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
           "requires": {
-            "ms": "2.0.0"
+            "ms": "2.1.1"
           }
         },
         "lodash": {
-          "version": "4.17.10",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz",
-          "integrity": "sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg=="
+          "version": "4.17.11",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
+          "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg=="
+        },
+        "ms": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="
         },
         "opn": {
-          "version": "5.3.0",
-          "resolved": "https://registry.npmjs.org/opn/-/opn-5.3.0.tgz",
-          "integrity": "sha512-bYJHo/LOmoTd+pfiYhfZDnf9zekVJrY+cnS2a5F2x+w5ppvTqObojTP7WiFG+kVZs9Inw+qQ/lw7TroWwhdd2g==",
+          "version": "5.4.0",
+          "resolved": "https://registry.npmjs.org/opn/-/opn-5.4.0.tgz",
+          "integrity": "sha512-YF9MNdVy/0qvJvDtunAOzFw9iasOQHpVthTCvGzxt61Il64AYSGdK+rYwld7NAfk9qJ7dt+hymBNSc9LNYS+Sw==",
           "requires": {
             "is-wsl": "1.1.0"
           }
         },
+        "semver": {
+          "version": "5.6.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz",
+          "integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg=="
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
+        },
+        "source-map-support": {
+          "version": "0.5.10",
+          "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.10.tgz",
+          "integrity": "sha512-YfQ3tQFTK/yzlGJuX8pTwa4tifQj4QS2Mj7UegOu8jAz59MqIiMGPXxQhVQiIMNzayuUSF/jEuVnfFF5JqybmQ==",
+          "requires": {
+            "buffer-from": "1.1.1",
+            "source-map": "0.6.1"
+          }
+        },
         "supports-color": {
-          "version": "5.4.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
-          "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
           "requires": {
             "has-flag": "3.0.0"
           }
+        },
+        "uuid": {
+          "version": "3.3.2",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",
+          "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA=="
         }
       }
     },
     "snyk-config": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/snyk-config/-/snyk-config-2.1.0.tgz",
-      "integrity": "sha512-D1Xz1pZa9lwA9AHogmAigyJGo/iuEGH+rcPB77mFsneVfnuiK9c6IjnsHbEBUf1cePtZvWdGBjs6e75Cvc2AMg==",
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/snyk-config/-/snyk-config-2.2.1.tgz",
+      "integrity": "sha512-eCsFKHHE4J2DpD/1NzAtCmkmVDK310OXRtmoW0RlLnld1ESprJ5A/QRJ5Zxx1JbA8gjuwERY5vfUFA8lEJeopA==",
       "requires": {
-        "debug": "3.1.0",
+        "debug": "3.2.6",
+        "lodash": "4.17.11",
         "nconf": "0.10.0"
       },
       "dependencies": {
         "debug": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "version": "3.2.6",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
           "requires": {
-            "ms": "2.0.0"
+            "ms": "2.1.1"
           }
+        },
+        "lodash": {
+          "version": "4.17.11",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
+          "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg=="
+        },
+        "ms": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="
+        }
+      }
+    },
+    "snyk-docker-plugin": {
+      "version": "1.22.0",
+      "resolved": "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-1.22.0.tgz",
+      "integrity": "sha512-bykxNtfeWQNFjF6gv8u8w+TOa4fdr+teLm+DkvYlWkdlvaw5m4yywRI5USve4X6S9p4G+Fw4/wfjXx7LgCcxrQ==",
+      "requires": {
+        "debug": "3.2.6",
+        "dockerfile-ast": "0.0.12",
+        "semver": "5.6.0",
+        "tslib": "1.9.3"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.2.6",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+          "requires": {
+            "ms": "2.1.1"
+          }
+        },
+        "ms": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="
+        },
+        "semver": {
+          "version": "5.6.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz",
+          "integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg=="
         }
       }
     },
     "snyk-go-plugin": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/snyk-go-plugin/-/snyk-go-plugin-1.5.1.tgz",
-      "integrity": "sha512-8OPJOT05Z/UL5fFSXV6b/A6KjlS1Ahr2gpup1bhXtAGXlUUPyWidqkCIER9fexDXqYWgAoDAdn9YHIvmL/5bfw==",
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/snyk-go-plugin/-/snyk-go-plugin-1.6.1.tgz",
+      "integrity": "sha512-hFOMyznfcMzF1HaZP18VmjQSqK/jBOowh0lpJY4UqmaQSZyJury3Ax+44O9oVUJi8lb8A4g7RVbxhlWl6bIqlA==",
       "requires": {
-        "graphlib": "2.1.5",
+        "graphlib": "2.1.7",
         "tmp": "0.0.33",
-        "toml": "2.3.3"
+        "toml": "2.3.6"
       }
     },
     "snyk-gradle-plugin": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-1.3.0.tgz",
-      "integrity": "sha512-rKZcPwbDM9zk3pFcO0w77MIKOZTkk5ZBVBkBlTlUiFg+eNOKqPTmw2hBGF5NB4ASQmMnx3uB1C8+hrQ405CthA==",
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-2.1.3.tgz",
+      "integrity": "sha512-xti5Uox0NLPO89O/MQd9qgnlynNtO2eXSukzyjONeGgueyNv6I7FQnUvHtVj6IUCBPlMP8c5D7bQmlFfemz8ZA==",
       "requires": {
         "clone-deep": "0.3.0"
       }
     },
     "snyk-module": {
-      "version": "1.8.2",
-      "resolved": "https://registry.npmjs.org/snyk-module/-/snyk-module-1.8.2.tgz",
-      "integrity": "sha512-XqhdbZ/CUuJ5gSaYdYfapLqx9qm2Mp6nyRMBCLXe9tJSiohOJsc9fQuUDbdOiRCqpA4BD6WLl+qlwOJmJoszBg==",
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/snyk-module/-/snyk-module-1.9.1.tgz",
+      "integrity": "sha512-A+CCyBSa4IKok5uEhqT+hV/35RO6APFNLqk9DRRHg7xW2/j//nPX8wTSZUPF8QeRNEk/sX+6df7M1y6PBHGSHA==",
       "requires": {
-        "debug": "3.1.0",
-        "hosted-git-info": "2.5.0"
+        "debug": "3.2.6",
+        "hosted-git-info": "2.7.1"
       },
       "dependencies": {
         "debug": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "version": "3.2.6",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
           "requires": {
-            "ms": "2.0.0"
+            "ms": "2.1.1"
           }
+        },
+        "hosted-git-info": {
+          "version": "2.7.1",
+          "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.7.1.tgz",
+          "integrity": "sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w=="
+        },
+        "ms": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="
         }
       }
     },
     "snyk-mvn-plugin": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-1.2.0.tgz",
-      "integrity": "sha512-ieTWhn1MB88gEQ6nUtGCeUKQ6Xoxm+u+QmD9u3zfP1QS5ep9fWt3YYDUQjgUiDTJJy7QyVQdZ/fsz3RECnOA7w=="
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-2.0.1.tgz",
+      "integrity": "sha512-TBrdcFXHdYuRYFCvpyUeFC+mCi6SOV3vdxgHrP7JRNnJwO8PYaKCObLJyhpRWa8IaHv/8CjJTmnEbWIh7BPHAA=="
+    },
+    "snyk-nodejs-lockfile-parser": {
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/snyk-nodejs-lockfile-parser/-/snyk-nodejs-lockfile-parser-1.11.0.tgz",
+      "integrity": "sha512-eTdq5VcaHJwGoApejebTChi5hRcIDdNbO6lMwncS0zz9ZxXskoQ0C+VMdep8ELmJa0Gcz6es1sSkABPZs7frrg==",
+      "requires": {
+        "@yarnpkg/lockfile": "1.1.0",
+        "graphlib": "2.1.7",
+        "lodash": "4.17.11",
+        "source-map-support": "0.5.10",
+        "tslib": "1.9.3",
+        "uuid": "3.3.2"
+      },
+      "dependencies": {
+        "lodash": {
+          "version": "4.17.11",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
+          "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg=="
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
+        },
+        "source-map-support": {
+          "version": "0.5.10",
+          "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.10.tgz",
+          "integrity": "sha512-YfQ3tQFTK/yzlGJuX8pTwa4tifQj4QS2Mj7UegOu8jAz59MqIiMGPXxQhVQiIMNzayuUSF/jEuVnfFF5JqybmQ==",
+          "requires": {
+            "buffer-from": "1.1.1",
+            "source-map": "0.6.1"
+          }
+        },
+        "uuid": {
+          "version": "3.3.2",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",
+          "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA=="
+        }
+      }
     },
     "snyk-nuget-plugin": {
-      "version": "1.6.2",
-      "resolved": "https://registry.npmjs.org/snyk-nuget-plugin/-/snyk-nuget-plugin-1.6.2.tgz",
-      "integrity": "sha512-8l8hS85esXyweTFgUFdwnGT94Ts42KcG5fdBX2wYosQkpUMePd+GTT9+64k/GvdH5hqcNt2OvtzW+Uf8JF+pbA==",
+      "version": "1.7.2",
+      "resolved": "https://registry.npmjs.org/snyk-nuget-plugin/-/snyk-nuget-plugin-1.7.2.tgz",
+      "integrity": "sha512-zmYD9veH7OeIqGnZHiGv8c8mKtmYrxo2o7P4lNUkpHdCMMsar7moRJxGgO9WlcIrwAGjIhMdP9fUvJ+jVDEteQ==",
       "requires": {
-        "debug": "3.1.0",
-        "es6-promise": "4.2.4",
-        "lodash": "4.17.10",
-        "xml2js": "0.4.19",
-        "zip": "1.2.0"
+        "debug": "3.2.6",
+        "jszip": "3.2.0",
+        "lodash": "4.17.11",
+        "snyk-paket-parser": "1.4.3",
+        "xml2js": "0.4.19"
       },
       "dependencies": {
         "debug": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "version": "3.2.6",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
           "requires": {
-            "ms": "2.0.0"
+            "ms": "2.1.1"
           }
         },
-        "es6-promise": {
-          "version": "4.2.4",
-          "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.4.tgz",
-          "integrity": "sha512-/NdNZVJg+uZgtm9eS3O6lrOLYmQag2DjdEXuPaHlZ6RuVqgqaVZfgYCepEIKsLqwdQArOPtC3XzRLqGGfT8KQQ=="
-        },
         "lodash": {
-          "version": "4.17.10",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz",
-          "integrity": "sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg=="
+          "version": "4.17.11",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
+          "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg=="
+        },
+        "ms": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="
         }
       }
     },
+    "snyk-paket-parser": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/snyk-paket-parser/-/snyk-paket-parser-1.4.3.tgz",
+      "integrity": "sha512-6m736zGVoeT/zS9KEtlmqTSPEPjAfLe8iYoQ3AwbyxDhzuLY49lTaV67MyZtGwjhi1x4KBe+XOgeWwyf6Avf/A==",
+      "requires": {
+        "tslib": "1.9.3"
+      }
+    },
     "snyk-php-plugin": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/snyk-php-plugin/-/snyk-php-plugin-1.5.1.tgz",
-      "integrity": "sha512-g5QSHBsRJ2O4cNxKC4zlWwnQYiSgQ77Y6QgGmo3ihPX3VLZrc1amaZIpPsNe1jwXirnGj2rvR5Xw+jDjbzvHFw==",
+      "version": "1.5.2",
+      "resolved": "https://registry.npmjs.org/snyk-php-plugin/-/snyk-php-plugin-1.5.2.tgz",
+      "integrity": "sha512-s/s9s7mslHjLnzin2BNLGdy/s6tNBfJ4/T/d9JBjsjIwdJFaUKY/ciWwBLNaWt2Aqtyr3DiUcqg3j/pwTKhEDg==",
       "requires": {
-        "debug": "3.1.0",
-        "lodash": "4.17.10",
-        "path": "0.12.7"
+        "debug": "3.2.6",
+        "lodash": "4.17.11"
       },
       "dependencies": {
         "debug": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "version": "3.2.6",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
           "requires": {
-            "ms": "2.0.0"
+            "ms": "2.1.1"
           }
         },
         "lodash": {
-          "version": "4.17.10",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz",
-          "integrity": "sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg=="
+          "version": "4.17.11",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
+          "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg=="
+        },
+        "ms": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="
         }
       }
     },
     "snyk-policy": {
-      "version": "1.12.0",
-      "resolved": "https://registry.npmjs.org/snyk-policy/-/snyk-policy-1.12.0.tgz",
-      "integrity": "sha512-CEioNnDzccHyid7UIVl3bJ1dnG4co4ofI+KxuC1mo0IUXy64gxnBTeVoZF5gVLWbAyxGxSeW8f0+8GmWMHVb7w==",
+      "version": "1.13.3",
+      "resolved": "https://registry.npmjs.org/snyk-policy/-/snyk-policy-1.13.3.tgz",
+      "integrity": "sha512-6J2a+Wt9zgvTtCwi4x8rLtkDQzFNPqubfIgs3aR35ZsEXPwI4XHGo0cxnJPDriqncp2JK72vnRpNfIZ7v0L1Mw==",
       "requires": {
-        "debug": "3.1.0",
+        "debug": "3.2.6",
         "email-validator": "2.0.4",
-        "js-yaml": "3.11.0",
+        "js-yaml": "3.12.2",
         "lodash.clonedeep": "4.5.0",
-        "semver": "5.5.0",
-        "snyk-module": "1.8.2",
+        "semver": "5.6.0",
+        "snyk-module": "1.9.1",
         "snyk-resolve": "1.0.1",
-        "snyk-try-require": "1.3.0",
+        "snyk-try-require": "1.3.1",
         "then-fs": "2.0.0"
       },
       "dependencies": {
@@ -8763,33 +8882,43 @@
           }
         },
         "debug": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "version": "3.2.6",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
           "requires": {
-            "ms": "2.0.0"
+            "ms": "2.1.1"
           }
         },
         "esprima": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz",
-          "integrity": "sha512-oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw=="
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+          "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="
         },
         "js-yaml": {
-          "version": "3.11.0",
-          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.11.0.tgz",
-          "integrity": "sha512-saJstZWv7oNeOyBh3+Dx1qWzhW0+e6/8eDzo7p5rDFqxntSztloLtuKu+Ejhtq82jsilwOIZYsCz+lIjthg1Hw==",
+          "version": "3.12.2",
+          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.2.tgz",
+          "integrity": "sha512-QHn/Lh/7HhZ/Twc7vJYQTkjuCa0kaCcDcjK5Zlk2rvnUpy7DxMJ23+Jc2dcyvltwQVg1nygAVlB2oRDFHoRS5Q==",
           "requires": {
             "argparse": "1.0.10",
-            "esprima": "4.0.0"
+            "esprima": "4.0.1"
           }
+        },
+        "ms": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="
+        },
+        "semver": {
+          "version": "5.6.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz",
+          "integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg=="
         }
       }
     },
     "snyk-python-plugin": {
-      "version": "1.6.1",
-      "resolved": "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.6.1.tgz",
-      "integrity": "sha512-6zr5jAB3p/bwMZQxZpdj+aPmioTgHB4DI6JMLInhZupss0x8Ome5YqzVzBbOvUKNrc3KaLtjGrJWcAuxDL6M/g==",
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.9.1.tgz",
+      "integrity": "sha512-4R040DBK77NSfSy3rCndmrv85YlLrKZU1ct59oZSoGb1PYdCi8kXRuq50UpSgasp6YR0yJxT22T38hNOAjTtVw==",
       "requires": {
         "tmp": "0.0.33"
       }
@@ -8799,67 +8928,80 @@
       "resolved": "https://registry.npmjs.org/snyk-resolve/-/snyk-resolve-1.0.1.tgz",
       "integrity": "sha512-7+i+LLhtBo1Pkth01xv+RYJU8a67zmJ8WFFPvSxyCjdlKIcsps4hPQFebhz+0gC5rMemlaeIV6cqwqUf9PEDpw==",
       "requires": {
-        "debug": "3.1.0",
+        "debug": "3.2.6",
         "then-fs": "2.0.0"
       },
       "dependencies": {
         "debug": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "version": "3.2.6",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
           "requires": {
-            "ms": "2.0.0"
+            "ms": "2.1.1"
           }
+        },
+        "ms": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="
         }
       }
     },
     "snyk-resolve-deps": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/snyk-resolve-deps/-/snyk-resolve-deps-3.1.0.tgz",
-      "integrity": "sha512-YVAelR+dTpqLgfk6lf6WgOlw+MGmGI0r3/Dny8tUbJJ9uVTHTRAOdZCbUyTFqJG7oEmEZxUwmfjqgAuniYwx8Q==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/snyk-resolve-deps/-/snyk-resolve-deps-4.0.2.tgz",
+      "integrity": "sha512-nlw62wiWhGOTw3BD3jVIwrUkRR4iNxEkkO4Y/PWs8BsUWseGu1H6QgLesFXJb3qx7ANJ5UbUCJMgV+eL0Lf9cA==",
       "requires": {
         "ansicolors": "0.3.2",
-        "debug": "3.1.0",
+        "debug": "3.2.6",
         "lodash.assign": "4.2.0",
         "lodash.assignin": "4.2.0",
+        "lodash.clone": "4.5.0",
         "lodash.flatten": "4.4.0",
         "lodash.get": "4.4.2",
         "lodash.set": "4.3.2",
-        "lru-cache": "4.1.3",
-        "semver": "5.5.0",
-        "snyk-module": "1.8.2",
+        "lru-cache": "4.1.5",
+        "semver": "5.6.0",
+        "snyk-module": "1.9.1",
         "snyk-resolve": "1.0.1",
         "snyk-tree": "1.0.0",
-        "snyk-try-require": "1.3.0",
+        "snyk-try-require": "1.3.1",
         "then-fs": "2.0.0"
       },
       "dependencies": {
         "debug": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "version": "3.2.6",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
           "requires": {
-            "ms": "2.0.0"
+            "ms": "2.1.1"
           }
         },
         "lru-cache": {
-          "version": "4.1.3",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.3.tgz",
-          "integrity": "sha512-fFEhvcgzuIoJVUF8fYr5KR0YqxD238zgObTps31YdADwPPAp82a4M8TrckkWyx7ekNlf9aBcVn81cFwwXngrJA==",
+          "version": "4.1.5",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
+          "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
           "requires": {
             "pseudomap": "1.0.2",
             "yallist": "2.1.2"
           }
+        },
+        "ms": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="
+        },
+        "semver": {
+          "version": "5.6.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz",
+          "integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg=="
         }
       }
     },
     "snyk-sbt-plugin": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/snyk-sbt-plugin/-/snyk-sbt-plugin-1.3.0.tgz",
-      "integrity": "sha512-SRxPB16392dvN3Qv2RfUcHe0XETLWx2kNIOuoNXvc2Gl6DuPW+X+meDJY7xC/yQhU7bSPPKoM2B7awYaj9i2Bg==",
-      "requires": {
-        "debug": "2.6.9"
-      }
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/snyk-sbt-plugin/-/snyk-sbt-plugin-2.0.1.tgz",
+      "integrity": "sha512-AsGGMP0W3mlKygXUI5jjt54qWFttZEXT1A40+u21p8rZPXLZprwnd+QH9pZDd04d9W9aofGvON8NJeOn9KS39Q=="
     },
     "snyk-tree": {
       "version": "1.0.0",
@@ -8870,32 +9012,37 @@
       }
     },
     "snyk-try-require": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/snyk-try-require/-/snyk-try-require-1.3.0.tgz",
-      "integrity": "sha1-81cGrPkciveI1Y4fGta/D89sVJM=",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/snyk-try-require/-/snyk-try-require-1.3.1.tgz",
+      "integrity": "sha1-bgJvkuZK9/zM6h7lPVJIQeQYohI=",
       "requires": {
-        "debug": "3.1.0",
+        "debug": "3.2.6",
         "lodash.clonedeep": "4.5.0",
-        "lru-cache": "4.1.3",
+        "lru-cache": "4.1.5",
         "then-fs": "2.0.0"
       },
       "dependencies": {
         "debug": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "version": "3.2.6",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
           "requires": {
-            "ms": "2.0.0"
+            "ms": "2.1.1"
           }
         },
         "lru-cache": {
-          "version": "4.1.3",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.3.tgz",
-          "integrity": "sha512-fFEhvcgzuIoJVUF8fYr5KR0YqxD238zgObTps31YdADwPPAp82a4M8TrckkWyx7ekNlf9aBcVn81cFwwXngrJA==",
+          "version": "4.1.5",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
+          "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
           "requires": {
             "pseudomap": "1.0.2",
             "yallist": "2.1.2"
           }
+        },
+        "ms": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="
         }
       }
     },
@@ -8992,7 +9139,7 @@
       "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-3.0.1.tgz",
       "integrity": "sha512-ZwEDymm204mTzvdqyUqOdovVr2YRd2NYskrYrF2LXyZ9qDiMAoFESGK8CRphiO7rtbo2Y757k2Nia3x2hGtalA==",
       "requires": {
-        "agent-base": "4.2.0",
+        "agent-base": "4.2.1",
         "socks": "1.1.10"
       }
     },
@@ -9378,6 +9525,11 @@
         "rocambole-strip-debugger": "1.0.0"
       }
     },
+    "strip-eof": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
+      "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8="
+    },
     "strip-indent": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz",
@@ -9490,6 +9642,57 @@
         "uuid": "3.2.1"
       }
     },
+    "term-size": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/term-size/-/term-size-1.2.0.tgz",
+      "integrity": "sha1-RYuDiH8oj8Vtb/+/rSYuJmOO+mk=",
+      "requires": {
+        "execa": "0.7.0"
+      },
+      "dependencies": {
+        "cross-spawn": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
+          "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
+          "requires": {
+            "lru-cache": "4.1.5",
+            "shebang-command": "1.2.0",
+            "which": "1.3.1"
+          }
+        },
+        "execa": {
+          "version": "0.7.0",
+          "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
+          "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
+          "requires": {
+            "cross-spawn": "5.1.0",
+            "get-stream": "3.0.0",
+            "is-stream": "1.1.0",
+            "npm-run-path": "2.0.2",
+            "p-finally": "1.0.0",
+            "signal-exit": "3.0.2",
+            "strip-eof": "1.0.0"
+          }
+        },
+        "lru-cache": {
+          "version": "4.1.5",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
+          "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
+          "requires": {
+            "pseudomap": "1.0.2",
+            "yallist": "2.1.2"
+          }
+        },
+        "which": {
+          "version": "1.3.1",
+          "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+          "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+          "requires": {
+            "isexe": "2.0.0"
+          }
+        }
+      }
+    },
     "text-table": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
@@ -9656,6 +9859,11 @@
       "integrity": "sha1-Sncotqwo2w4Aj1FAQ/1VW9VXO0Y=",
       "dev": true
     },
+    "timed-out": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-4.0.1.tgz",
+      "integrity": "sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8="
+    },
     "timers-browserify": {
       "version": "1.4.2",
       "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-1.4.2.tgz",
@@ -9821,9 +10029,9 @@
       }
     },
     "toml": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/toml/-/toml-2.3.3.tgz",
-      "integrity": "sha512-O7L5hhSQHxuufWUdcTRPfuTh3phKfAZ/dqfxZFoxPCj2RYmpaSGLEIs016FCXItQwNr08yefUB5TSjzRYnajTA=="
+      "version": "2.3.6",
+      "resolved": "https://registry.npmjs.org/toml/-/toml-2.3.6.tgz",
+      "integrity": "sha512-gVweAectJU3ebq//Ferr2JUY4WKSDe5N+z0FvjDncLGyHmIDoxgY/2Ie4qfEIDm4IS7OA6Rmdm7pdEEdMcV/xQ=="
     },
     "topojson": {
       "version": "1.6.26",
@@ -9918,6 +10126,11 @@
       "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=",
       "dev": true
     },
+    "tslib": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz",
+      "integrity": "sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ=="
+    },
     "tty-browserify": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.1.tgz",
@@ -9975,14 +10188,6 @@
       "resolved": "https://registry.npmjs.org/umd/-/umd-3.0.1.tgz",
       "integrity": "sha1-iuVW4RAR9jwllnCKiDclnwGz1g4="
     },
-    "undefsafe": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/undefsafe/-/undefsafe-2.0.2.tgz",
-      "integrity": "sha1-Il9rngM3Zj4Njnz9aG/Cg2zKznY=",
-      "requires": {
-        "debug": "2.6.9"
-      }
-    },
     "underscore": {
       "version": "1.7.0",
       "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz",
@@ -10031,6 +10236,56 @@
       "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
       "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw="
     },
+    "unzip-response": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/unzip-response/-/unzip-response-2.0.1.tgz",
+      "integrity": "sha1-0vD3N9FrBhXnKmk17QQhRXLVb5c="
+    },
+    "update-notifier": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-2.5.0.tgz",
+      "integrity": "sha512-gwMdhgJHGuj/+wHJJs9e6PcCszpxR1b236igrOkUofGhqJuG+amlIKwApH1IW1WWl7ovZxsX49lMBWLxSdm5Dw==",
+      "requires": {
+        "boxen": "1.3.0",
+        "chalk": "2.4.2",
+        "configstore": "3.1.2",
+        "import-lazy": "2.1.0",
+        "is-ci": "1.2.1",
+        "is-installed-globally": "0.1.0",
+        "is-npm": "1.0.0",
+        "latest-version": "3.1.0",
+        "semver-diff": "2.1.0",
+        "xdg-basedir": "3.0.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "requires": {
+            "color-convert": "1.9.1"
+          }
+        },
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "requires": {
+            "ansi-styles": "3.2.1",
+            "escape-string-regexp": "1.0.5",
+            "supports-color": "5.5.0"
+          }
+        },
+        "supports-color": {
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+          "requires": {
+            "has-flag": "3.0.0"
+          }
+        }
+      }
+    },
     "upper-case": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz",
@@ -10068,6 +10323,14 @@
         }
       }
     },
+    "url-parse-lax": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz",
+      "integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=",
+      "requires": {
+        "prepend-http": "1.0.4"
+      }
+    },
     "util": {
       "version": "0.10.3",
       "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
@@ -10137,6 +10400,11 @@
         "indexof": "0.0.1"
       }
     },
+    "vscode-languageserver-types": {
+      "version": "3.14.0",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.14.0.tgz",
+      "integrity": "sha512-lTmS6AlAlMHOvPQemVwo3CezxBp0sNB95KNPkqp3Nxd5VFEnuG1ByM0zlRWos0zjO3ZWtkvhal0COgiV1xIA4A=="
+    },
     "watchify": {
       "version": "3.11.0",
       "resolved": "https://registry.npmjs.org/watchify/-/watchify-3.11.0.tgz",
@@ -10325,12 +10593,41 @@
       "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=",
       "dev": true
     },
-    "win-release": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/win-release/-/win-release-1.1.1.tgz",
-      "integrity": "sha1-X6VeAr58qTTt/BJmVjLoSbcuUgk=",
+    "widest-line": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-2.0.1.tgz",
+      "integrity": "sha512-Ba5m9/Fa4Xt9eb2ELXt77JxVDV8w7qQrH0zS/TWSJdLyAwQjWoOzpzj5lwVftDz6n/EOu3tNACS84v509qwnJA==",
       "requires": {
-        "semver": "5.5.0"
+        "string-width": "2.1.1"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
+        },
+        "is-fullwidth-code-point": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
+        },
+        "string-width": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+          "requires": {
+            "is-fullwidth-code-point": "2.0.0",
+            "strip-ansi": "4.0.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+          "requires": {
+            "ansi-regex": "3.0.0"
+          }
+        }
       }
     },
     "window-size": {
@@ -10339,6 +10636,14 @@
       "integrity": "sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=",
       "dev": true
     },
+    "windows-release": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/windows-release/-/windows-release-3.1.0.tgz",
+      "integrity": "sha512-hBb7m7acFgQPQc222uEQTmdcGLeBmQLNLFIh0rDk3CwFOBrfjefLzEfEfmpMq8Af/n/GnFf3eYf203FY1PmudA==",
+      "requires": {
+        "execa": "0.10.0"
+      }
+    },
     "wordwrap": {
       "version": "0.0.3",
       "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
@@ -10374,19 +10679,19 @@
       "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
     },
     "write-file-atomic": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.3.0.tgz",
-      "integrity": "sha512-xuPeK4OdjWqtfi59ylvVL0Yn35SF3zgcAcv7rBPFHVaEapaDr4GdGgm3j7ckTwH9wHL7fGmgfAnb0+THrHb8tA==",
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.4.2.tgz",
+      "integrity": "sha512-s0b6vB3xIVRLWywa6X9TOMA7k9zio0TMOsl9ZnDkliA/cfJlpHXAscj0gbHVJiTdIuAYpIyqS5GW91fqm6gG5g==",
       "requires": {
-        "graceful-fs": "4.1.11",
+        "graceful-fs": "4.1.15",
         "imurmurhash": "0.1.4",
         "signal-exit": "3.0.2"
       },
       "dependencies": {
         "graceful-fs": {
-          "version": "4.1.11",
-          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
-          "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg="
+          "version": "4.1.15",
+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz",
+          "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA=="
         }
       }
     },
@@ -10518,30 +10823,6 @@
       "integrity": "sha1-AI4G2AlDIMNy28L47XagymyKxBk=",
       "dev": true
     },
-    "zip": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/zip/-/zip-1.2.0.tgz",
-      "integrity": "sha1-rQrUImUwm+QutW/IYZThfCTmapw=",
-      "requires": {
-        "bops": "0.1.1"
-      },
-      "dependencies": {
-        "base64-js": {
-          "version": "0.0.2",
-          "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-0.0.2.tgz",
-          "integrity": "sha1-Ak8Pcq+iW3X5wO5zzU9V7Bvtl4Q="
-        },
-        "bops": {
-          "version": "0.1.1",
-          "resolved": "https://registry.npmjs.org/bops/-/bops-0.1.1.tgz",
-          "integrity": "sha1-Bi4CqNqoAfoQ8uXb5nQM/4Af4X4=",
-          "requires": {
-            "base64-js": "0.0.2",
-            "to-utf8": "0.0.1"
-          }
-        }
-      }
-    },
     "zone.js": {
       "version": "0.6.12",
       "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.6.12.tgz",
diff --git a/package.json b/package.json
index 84f4d73b..131be691 100644
--- a/package.json
+++ b/package.json
@@ -1,15 +1,13 @@
 {
   "name": "maps.openrouteservice.org",
-  "version": "0.3.7",
+  "version": "0.3.8",
   "repository": {
     "type": "git",
     "url": "https://github.com/GIScience/openrouteservice-app.git"
   },
   "scripts": {
     "start": "npm run lite",
-    "lite": "lite-server",
-    "snyk-protect": "snyk protect",
-    "prepare": "npm run snyk-protect"
+    "lite": "lite-server"
   },
   "license": "ISC",
   "dependencies": {
@@ -30,7 +28,7 @@
     "leaflet-control-angular": "^0.1.4",
     "leaflet-geometryutil": "^0.8.0",
     "leaflet-omnivore": "^0.3.4",
-    "snyk": "^1.80.1",
+    "snyk": "^1.135.1",
     "togpx": "^0.5.3",
     "tokml": "^0.4.0",
     "xml-js": "^1.6.7",