diff --git a/.babelrc b/.babelrc
index 70ddcb8..4d6bb15 100644
--- a/.babelrc
+++ b/.babelrc
@@ -1,9 +1,11 @@
 {
   "presets": [
+    "es2015",
+    "es2017",
+    "stage-0",
     [
       "env",
       {
-        "modules": false,
         "targets": {
           "browsers": ["last 3 versions", "not IE < 10"]
         }
@@ -11,7 +13,7 @@
     ]
   ],
   "plugins": [
-    "add-module-exports",
-    "transform-object-rest-spread"
+    "transform-runtime",
+    "add-module-exports"
   ]
-}
+}
\ No newline at end of file
diff --git a/package.json b/package.json
index 0c29964..f445afa 100644
--- a/package.json
+++ b/package.json
@@ -51,8 +51,10 @@
     "babel-loader": "^6.3.2",
     "babel-plugin-add-module-exports": "^0.2.1",
     "babel-plugin-transform-object-rest-spread": "^6.23.0",
+    "babel-plugin-transform-runtime": "^6.23.0",
     "babel-preset-env": "^1.1.8",
     "babel-preset-es2015": "^6.22.0",
+    "babel-preset-es2017": "^6.24.1",
     "babel-preset-stage-0": "^6.22.0",
     "chalk": "^1.1.3",
     "chokidar": "^1.6.1",
diff --git a/src/components/mdChips/mdChips.vue b/src/components/mdChips/mdChips.vue
index 74c06e6..693874e 100644
--- a/src/components/mdChips/mdChips.vue
+++ b/src/components/mdChips/mdChips.vue
@@ -1,5 +1,5 @@
 <template>
-  <md-input-container :class="[themeClass, classes]" @click.native="applyInputFocus">
+  <md-input-container class="md-chips" :class="[themeClass, classes]" @click.native="applyInputFocus">
     <md-chip
       v-for="chip in selectedChips"
       :md-deletable="!mdStatic"
@@ -25,7 +25,8 @@
 
     <slot></slot>
   </md-input-container>
-  <div class="md-chips" :class="[themeClass, classes]">
+  
+  <!--<div class="md-chips" :class="[themeClass, classes]">
     <md-input-container @click.native="applyInputFocus">
       <md-chip
         v-for="chip in selectedChips"
@@ -51,7 +52,7 @@
         ref="input">
       </md-input>
     </md-input-container>
-  </div>
+  </div>-->
 </template>
 
 <style lang="scss" src="./mdChips.scss"></style>