diff --git a/.babelrc b/.babelrc
index 4c3520ea..94bda50e 100644
--- a/.babelrc
+++ b/.babelrc
@@ -9,7 +9,7 @@
     }
   },
   "plugins": [
-    // es2015 preset, manual version:
+    // ES2015 preset, manual version:
     "transform-es2015-arrow-functions",
     "transform-es2015-block-scoped-functions",
     "transform-es2015-block-scoping",
@@ -28,12 +28,14 @@
     "transform-es2015-typeof-symbol",
     "transform-es2015-unicode-regex",
     //"transform-regenerator", // not needed in Chrome or Firefox. Soon won't be needed in Edge or Safari.
-    //"transform-async-to-generator",
     "transform-es5-property-mutators",
     // module support
     //"transform-es2015-modules-amd",
     "transform-es2015-modules-commonjs",
     //"transform-es2015-modules-systemjs", // needs System existing in global scope first (f.e. via SystemJS)
-    "transform-es2015-modules-umd"
+    "transform-es2015-modules-umd",
+    // ES017
+    "transform-runtime", // to make async/await work
+    "transform-async-to-generator" // to use async/await
   ]
 }
\ No newline at end of file
diff --git a/.eslintrc b/.eslintrc
index 20be45e3..88f6bc9a 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -1,6 +1,6 @@
 {
   "parserOptions": {
-    "ecmaVersion": 6,
+    "ecmaVersion": 2017,
     "sourceType": "module",
     "ecmaFeatures": {
       "jsx": true
diff --git a/package.json b/package.json
index b039a84e..7b52da3d 100644
--- a/package.json
+++ b/package.json
@@ -57,6 +57,7 @@
     "babel-plugin-transform-es2015-unicode-regex": "6.24.1",
     "babel-plugin-transform-es5-property-mutators": "6.24.1",
     "babel-plugin-transform-regenerator": "6.26.0",
+    "babel-plugin-transform-runtime": "^6.23.0",
     "babel-preset-env": "1.6.0",
     "babel-preset-react": "6.24.1",
     "babel-register": "6.26.0",
diff --git a/yarn.lock b/yarn.lock
index 965043f1..013dd092 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -398,6 +398,13 @@ aws4@^1.2.1, aws4@^1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.6.0.tgz#83ef5ca860b2b32e4a0deedee8c771b9db57471e"
 
+axios@0.17.1:
+  version "0.17.1"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-0.17.1.tgz#2d8e3e5d0bdbd7327f91bc814f5c57660f81824d"
+  dependencies:
+    follow-redirects "^1.2.5"
+    is-buffer "^1.1.5"
+
 axios@^0.16.2:
   version "0.16.2"
   resolved "https://registry.yarnpkg.com/axios/-/axios-0.16.2.tgz#ba4f92f17167dfbab40983785454b9ac149c3c6d"
@@ -405,13 +412,6 @@ axios@^0.16.2:
     follow-redirects "^1.2.3"
     is-buffer "^1.1.5"
 
-axios@^0.17.1:
-  version "0.17.1"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-0.17.1.tgz#2d8e3e5d0bdbd7327f91bc814f5c57660f81824d"
-  dependencies:
-    follow-redirects "^1.2.5"
-    is-buffer "^1.1.5"
-
 babel-code-frame@^6.11.0, babel-code-frame@^6.22.0, babel-code-frame@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
@@ -861,6 +861,12 @@ babel-plugin-transform-regenerator@6.26.0, babel-plugin-transform-regenerator@^6
   dependencies:
     regenerator-transform "^0.10.0"
 
+babel-plugin-transform-runtime@^6.23.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-runtime/-/babel-plugin-transform-runtime-6.23.0.tgz#88490d446502ea9b8e7efb0fe09ec4d99479b1ee"
+  dependencies:
+    babel-runtime "^6.22.0"
+
 babel-plugin-transform-strict-mode@^6.24.1:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz#d5faf7aa578a65bbe591cf5edae04a0c67020758"