diff --git a/.gitignore b/.gitignore
index 7e4e70fe0..c750822cf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@ fe.element/element-ui
 .npmrc
 coverage
 waiter.config.js
+build/bin/algolia-key.js
diff --git a/CHANGELOG.en-US.md b/CHANGELOG.en-US.md
index fb8ec4653..011544ef3 100644
--- a/CHANGELOG.en-US.md
+++ b/CHANGELOG.en-US.md
@@ -1,5 +1,12 @@
 ## Changelog
 
+### 1.4.7
+
+*2017-10-16*
+
+- Fixed compatibility of Autocomplete and Vue 2.5.x, #6942 (by @rennai)
+- Added `allow-focus` attribute for Switch, #7494 (by @breadadams)
+
 ### 1.4.6
 
 *2017-09-27*
diff --git a/CHANGELOG.zh-CN.md b/CHANGELOG.zh-CN.md
index 1d36d06c5..e7e4e92d1 100644
--- a/CHANGELOG.zh-CN.md
+++ b/CHANGELOG.zh-CN.md
@@ -1,5 +1,11 @@
 ## 更新日志
 
+### 1.4.7
+*2017-10-16*
+
+- 修复 Autocomplete 与 Vue 2.5.x 不兼容的问题，#6942（by @rennai）
+- Switch 新增 `allow-focus` 属性，#7494（by @breadadams）
+
 ### 1.4.6
 *2017-09-27*
 
diff --git a/examples/app.vue b/examples/app.vue
index 065c61878..5b6ad5cc6 100644
--- a/examples/app.vue
+++ b/examples/app.vue
@@ -204,8 +204,8 @@
         if (!notified) {
           const h = this.$createElement;
           const title = this.lang === 'zh-CN'
-            ? '2.0.0-alpha.1 发布'
-            : '2.0.0-alpha.1 released';
+            ? '2.0.0 Alpha 发布'
+            : '2.0.0 Alpha released';
           const messages = this.lang === 'zh-CN'
             ? ['点击', '这里', '查看详情']
             : ['Click ', 'here', ' to learn more'];
diff --git a/examples/docs/en-US/switch.md b/examples/docs/en-US/switch.md
index 64943aaae..bd1c72361 100644
--- a/examples/docs/en-US/switch.md
+++ b/examples/docs/en-US/switch.md
@@ -123,12 +123,12 @@ off-value  | switch value when in `off` state | boolean / string / number | —
 on-color | background color when in `on` state | string | — | #20A0FF
 off-color | background color when in `off` state | string | — | #C0CCDA
 name | input name of Switch | string | — | —
-allow-focus | allow `.focus()` & `.blur()` methods on the `input` $ref | boolean | — | false
+allow-focus | allow `focus` and `blur` events on the input | boolean | — | false
 
 ### Events
 
  Event Name | Description | Parameters
 ---- | ----| ----
-change | triggers when value changes | (value: Boolean)
-blur | triggers on blur (if `allowFocus` is `true`) | (event: Event)
-focus | triggers on focus (if `allowFocus` is `true`) | (event: Event)
+change | triggers when value changes | value after changing
+blur | triggers on blur (if `allow-focus` is true) | event: Event
+focus | triggers on focus (if `allow-focus` is true) | event: Event
diff --git a/examples/docs/zh-CN/switch.md b/examples/docs/zh-CN/switch.md
index 20ab6b79c..64d90d9d4 100644
--- a/examples/docs/zh-CN/switch.md
+++ b/examples/docs/zh-CN/switch.md
@@ -124,8 +124,11 @@
 | on-color  | switch 打开时的背景色    | string   | — | #20A0FF |
 | off-color  | switch 关闭时的背景色    | string   | — | #C0CCDA |
 | name  | switch 对应的 name 属性    | string   | — | — |
+| allow-focus  | 允许 switch 触发 focus 和 blur 事件 | boolean | — | false |
 
 ### Events
 | 事件名称      | 说明    | 回调参数      |
 |---------- |-------- |---------- |
 | change  | switch 状态发生变化时的回调函数    | 新状态的值 |
+| blur  | switch 失去焦点时触发，仅当 `allow-focus` 为 true 时生效 | Event 事件对象 |
+| focus  | switch 获得焦点时触发，仅当 `allow-focus` 为 true 时生效 | Event 事件对象 |