diff --git a/CHANGELOG.md b/CHANGELOG.md
index 03431f23..844dc5b8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,24 @@
+
+### v2.29.2 (2018-01-16)
+
+
+#### Features
+
+* **completions/zsh.rs:**
+ * Escape possible values for options ([25561dec](https://github.com/kbknapp/clap-rs/commit/25561decf147d329b64634a14d9695673c2fc78f))
+ * Implement postional argument possible values completion ([f3b0afd2](https://github.com/kbknapp/clap-rs/commit/f3b0afd2bef8b7be97162f8a7802ddf7603dff36))
+ * Complete positional arguments properly ([e39aeab8](https://github.com/kbknapp/clap-rs/commit/e39aeab8487596046fbdbc6a226e5c8820585245))
+
+#### Bug Fixes
+
+* **completions/zsh.rs:**
+ * Add missing autoload for is-at-least ([a6522607](https://github.com/kbknapp/clap-rs/commit/a652260795d1519f6ec2a7a09ccc1258499cad7b))
+ * Don't pass -S to _arguments if Zsh is too old ([16b4f143](https://github.com/kbknapp/clap-rs/commit/16b4f143ff466b7ef18a267bc44ade0f9639109b))
+ * Maybe fix completions with mixed positionals and subcommands ([1146f0da](https://github.com/kbknapp/clap-rs/commit/1146f0da154d6796fbfcb09db8efa3593cb0d898))
+* **completions/zsh.zsh:** Remove redundant code from output ([0e185b92](https://github.com/kbknapp/clap-rs/commit/0e185b922ed1e0fd653de00b4cd8d567d72ff68e), closes [#1142](https://github.com/kbknapp/clap-rs/issues/1142))
+
+
+
### 2.29.1 (2018-01-09)
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index c4f23859..8899cd36 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -9,77 +9,77 @@ the following is a list of contributors:
:---: |:---: |:---: |:---: |:---: |:---: |
[willmurphyscode](https://github.com/willmurphyscode) |[mgeisler](https://github.com/mgeisler) |[nabijaczleweli](https://github.com/nabijaczleweli) |[Byron](https://github.com/Byron) |[hgrecco](https://github.com/hgrecco) |[bluejekyll](https://github.com/bluejekyll) |
-[](https://github.com/ignatenkobrain) |[](https://github.com/james-darkfox) |[](https://github.com/H2CO3) |[](https://github.com/nateozem) |[](https://github.com/glowing-chemist) |[](https://github.com/rtaycher) |
+[](https://github.com/segevfiner) |[](https://github.com/ignatenkobrain) |[](https://github.com/james-darkfox) |[](https://github.com/H2CO3) |[](https://github.com/nateozem) |[](https://github.com/glowing-chemist) |
:---: |:---: |:---: |:---: |:---: |:---: |
-[ignatenkobrain](https://github.com/ignatenkobrain) |[james-darkfox](https://github.com/james-darkfox) |[H2CO3](https://github.com/H2CO3) |[nateozem](https://github.com/nateozem) |[glowing-chemist](https://github.com/glowing-chemist) |[rtaycher](https://github.com/rtaycher) |
+[segevfiner](https://github.com/segevfiner) |[ignatenkobrain](https://github.com/ignatenkobrain) |[james-darkfox](https://github.com/james-darkfox) |[H2CO3](https://github.com/H2CO3) |[nateozem](https://github.com/nateozem) |[glowing-chemist](https://github.com/glowing-chemist) |
-[](https://github.com/Arnavion) |[](https://github.com/japaric) |[](https://github.com/untitaker) |[](https://github.com/afiune) |[](https://github.com/crazymerlyn) |[](https://github.com/SuperFluffy) |
+[](https://github.com/rtaycher) |[](https://github.com/Arnavion) |[](https://github.com/japaric) |[](https://github.com/untitaker) |[](https://github.com/afiune) |[](https://github.com/crazymerlyn) |
:---: |:---: |:---: |:---: |:---: |:---: |
-[Arnavion](https://github.com/Arnavion) |[japaric](https://github.com/japaric) |[untitaker](https://github.com/untitaker) |[afiune](https://github.com/afiune) |[crazymerlyn](https://github.com/crazymerlyn) |[SuperFluffy](https://github.com/SuperFluffy) |
+[rtaycher](https://github.com/rtaycher) |[Arnavion](https://github.com/Arnavion) |[japaric](https://github.com/japaric) |[untitaker](https://github.com/untitaker) |[afiune](https://github.com/afiune) |[crazymerlyn](https://github.com/crazymerlyn) |
-[](https://github.com/matthiasbeyer) |[](https://github.com/malbarbo) |[](https://github.com/tshepang) |[](https://github.com/golem131) |[](https://github.com/jimmycuadra) |[](https://github.com/Nemo157) |
+[](https://github.com/SuperFluffy) |[](https://github.com/matthiasbeyer) |[](https://github.com/malbarbo) |[](https://github.com/tshepang) |[](https://github.com/golem131) |[](https://github.com/jimmycuadra) |
:---: |:---: |:---: |:---: |:---: |:---: |
-[matthiasbeyer](https://github.com/matthiasbeyer) |[malbarbo](https://github.com/malbarbo) |[tshepang](https://github.com/tshepang) |[golem131](https://github.com/golem131) |[jimmycuadra](https://github.com/jimmycuadra) |[Nemo157](https://github.com/Nemo157) |
+[SuperFluffy](https://github.com/SuperFluffy) |[matthiasbeyer](https://github.com/matthiasbeyer) |[malbarbo](https://github.com/malbarbo) |[tshepang](https://github.com/tshepang) |[golem131](https://github.com/golem131) |[jimmycuadra](https://github.com/jimmycuadra) |
-[](https://github.com/severen) |[](https://github.com/Eijebong) |[](https://github.com/cstorey) |[](https://github.com/wdv4758h) |[](https://github.com/frewsxcv) |[](https://github.com/hoodie) |
+[](https://github.com/Nemo157) |[](https://github.com/severen) |[](https://github.com/Eijebong) |[](https://github.com/cstorey) |[](https://github.com/wdv4758h) |[](https://github.com/frewsxcv) |
:---: |:---: |:---: |:---: |:---: |:---: |
-[severen](https://github.com/severen) |[Eijebong](https://github.com/Eijebong) |[cstorey](https://github.com/cstorey) |[wdv4758h](https://github.com/wdv4758h) |[frewsxcv](https://github.com/frewsxcv) |[hoodie](https://github.com/hoodie) |
+[Nemo157](https://github.com/Nemo157) |[severen](https://github.com/severen) |[Eijebong](https://github.com/Eijebong) |[cstorey](https://github.com/cstorey) |[wdv4758h](https://github.com/wdv4758h) |[frewsxcv](https://github.com/frewsxcv) |
-[](https://github.com/huonw) |[](https://github.com/GrappigPanda) |[](https://github.com/shepmaster) |[](https://github.com/porglezomp) |[](https://github.com/kieraneglin) |[](https://github.com/musoke) |
+[](https://github.com/hoodie) |[](https://github.com/huonw) |[](https://github.com/GrappigPanda) |[](https://github.com/shepmaster) |[](https://github.com/starkat99) |[](https://github.com/porglezomp) |
:---: |:---: |:---: |:---: |:---: |:---: |
-[huonw](https://github.com/huonw) |[GrappigPanda](https://github.com/GrappigPanda) |[shepmaster](https://github.com/shepmaster) |[porglezomp](https://github.com/porglezomp) |[kieraneglin](https://github.com/kieraneglin) |[musoke](https://github.com/musoke) |
+[hoodie](https://github.com/hoodie) |[huonw](https://github.com/huonw) |[GrappigPanda](https://github.com/GrappigPanda) |[shepmaster](https://github.com/shepmaster) |[starkat99](https://github.com/starkat99) |[porglezomp](https://github.com/porglezomp) |
-[](https://github.com/nelsonjchen) |[](https://github.com/pkgw) |[](https://github.com/Deedasmi) |[](https://github.com/vmchale) |[](https://github.com/messense) |[](https://github.com/Keats) |
+[](https://github.com/kraai) |[](https://github.com/musoke) |[](https://github.com/nelsonjchen) |[](https://github.com/pkgw) |[](https://github.com/Deedasmi) |[](https://github.com/vmchale) |
:---: |:---: |:---: |:---: |:---: |:---: |
-[nelsonjchen](https://github.com/nelsonjchen) |[pkgw](https://github.com/pkgw) |[Deedasmi](https://github.com/Deedasmi) |[vmchale](https://github.com/vmchale) |[messense](https://github.com/messense) |[Keats](https://github.com/Keats) |
+[kraai](https://github.com/kraai) |[musoke](https://github.com/musoke) |[nelsonjchen](https://github.com/nelsonjchen) |[pkgw](https://github.com/pkgw) |[Deedasmi](https://github.com/Deedasmi) |[vmchale](https://github.com/vmchale) |
-[](https://github.com/starkat99) |[](https://github.com/durka) |[](https://github.com/alex-gulyas) |[](https://github.com/cite-reader) |[](https://github.com/alexbool) |[](https://github.com/AluisioASG) |
+[](https://github.com/messense) |[](https://github.com/Keats) |[](https://github.com/kieraneglin) |[](https://github.com/durka) |[](https://github.com/alex-gulyas) |[](https://github.com/cite-reader) |
:---: |:---: |:---: |:---: |:---: |:---: |
-[starkat99](https://github.com/starkat99) |[durka](https://github.com/durka) |[alex-gulyas](https://github.com/alex-gulyas) |[cite-reader](https://github.com/cite-reader) |[alexbool](https://github.com/alexbool) |[AluisioASG](https://github.com/AluisioASG) |
+[messense](https://github.com/messense) |[Keats](https://github.com/Keats) |[kieraneglin](https://github.com/kieraneglin) |[durka](https://github.com/durka) |[alex-gulyas](https://github.com/alex-gulyas) |[cite-reader](https://github.com/cite-reader) |
-[](https://github.com/BurntSushi) |[](https://github.com/nox) |[](https://github.com/mitsuhiko) |[](https://github.com/brennie) |[](https://github.com/ogham) |[](https://github.com/pixelistik) |
+[](https://github.com/alexbool) |[](https://github.com/AluisioASG) |[](https://github.com/BurntSushi) |[](https://github.com/nox) |[](https://github.com/mitsuhiko) |[](https://github.com/brennie) |
:---: |:---: |:---: |:---: |:---: |:---: |
-[BurntSushi](https://github.com/BurntSushi) |[nox](https://github.com/nox) |[mitsuhiko](https://github.com/mitsuhiko) |[brennie](https://github.com/brennie) |[ogham](https://github.com/ogham) |[pixelistik](https://github.com/pixelistik) |
+[alexbool](https://github.com/alexbool) |[AluisioASG](https://github.com/AluisioASG) |[BurntSushi](https://github.com/BurntSushi) |[nox](https://github.com/nox) |[mitsuhiko](https://github.com/mitsuhiko) |[brennie](https://github.com/brennie) |
-[](https://github.com/dotdash) |[](https://github.com/bradurani) |[](https://github.com/Seeker14491) |[](https://github.com/brianp) |[](https://github.com/cldershem) |[](https://github.com/casey) |
+[](https://github.com/pixelistik) |[](https://github.com/Bilalh) |[](https://github.com/dotdash) |[](https://github.com/bradurani) |[](https://github.com/Seeker14491) |[](https://github.com/brianp) |
:---: |:---: |:---: |:---: |:---: |:---: |
-[dotdash](https://github.com/dotdash) |[bradurani](https://github.com/bradurani) |[Seeker14491](https://github.com/Seeker14491) |[brianp](https://github.com/brianp) |[cldershem](https://github.com/cldershem) |[casey](https://github.com/casey) |
+[pixelistik](https://github.com/pixelistik) |[Bilalh](https://github.com/Bilalh) |[dotdash](https://github.com/dotdash) |[bradurani](https://github.com/bradurani) |[Seeker14491](https://github.com/Seeker14491) |[brianp](https://github.com/brianp) |
-[](https://github.com/volks73) |[](https://github.com/daboross) |[](https://github.com/mernen) |[](https://github.com/dguo) |[](https://github.com/davidszotten) |[](https://github.com/drusellers) |
+[](https://github.com/cldershem) |[](https://github.com/casey) |[](https://github.com/volks73) |[](https://github.com/daboross) |[](https://github.com/mernen) |[](https://github.com/dguo) |
:---: |:---: |:---: |:---: |:---: |:---: |
-[volks73](https://github.com/volks73) |[daboross](https://github.com/daboross) |[mernen](https://github.com/mernen) |[dguo](https://github.com/dguo) |[davidszotten](https://github.com/davidszotten) |[drusellers](https://github.com/drusellers) |
+[cldershem](https://github.com/cldershem) |[casey](https://github.com/casey) |[volks73](https://github.com/volks73) |[daboross](https://github.com/daboross) |[mernen](https://github.com/mernen) |[dguo](https://github.com/dguo) |
-[](https://github.com/eddyb) |[](https://github.com/Enet4) |[](https://github.com/Fraser999) |[](https://github.com/birkenfeld) |[](https://github.com/guanqun) |[](https://github.com/tanakh) |
+[](https://github.com/davidszotten) |[](https://github.com/drusellers) |[](https://github.com/eddyb) |[](https://github.com/Enet4) |[](https://github.com/Fraser999) |[](https://github.com/birkenfeld) |
:---: |:---: |:---: |:---: |:---: |:---: |
-[eddyb](https://github.com/eddyb) |[Enet4](https://github.com/Enet4) |[Fraser999](https://github.com/Fraser999) |[birkenfeld](https://github.com/birkenfeld) |[guanqun](https://github.com/guanqun) |[tanakh](https://github.com/tanakh) |
+[davidszotten](https://github.com/davidszotten) |[drusellers](https://github.com/drusellers) |[eddyb](https://github.com/eddyb) |[Enet4](https://github.com/Enet4) |[Fraser999](https://github.com/Fraser999) |[birkenfeld](https://github.com/birkenfeld) |
-[](https://github.com/SirVer) |[](https://github.com/idmit) |[](https://github.com/archer884) |[](https://github.com/jacobmischka) |[](https://github.com/jespino) |[](https://github.com/jfrankenau) |
+[](https://github.com/guanqun) |[](https://github.com/tanakh) |[](https://github.com/SirVer) |[](https://github.com/idmit) |[](https://github.com/archer884) |[](https://github.com/discosultan) |
:---: |:---: |:---: |:---: |:---: |:---: |
-[SirVer](https://github.com/SirVer) |[idmit](https://github.com/idmit) |[archer884](https://github.com/archer884) |[jacobmischka](https://github.com/jacobmischka) |[jespino](https://github.com/jespino) |[jfrankenau](https://github.com/jfrankenau) |
+[guanqun](https://github.com/guanqun) |[tanakh](https://github.com/tanakh) |[SirVer](https://github.com/SirVer) |[idmit](https://github.com/idmit) |[archer884](https://github.com/archer884) |[discosultan](https://github.com/discosultan) |
-[](https://github.com/jtdowney) |[](https://github.com/andete) |[](https://github.com/joshtriplett) |[](https://github.com/Kalwyn) |[](https://github.com/manuel-rhdt) |[](https://github.com/Marwes) |
+[](https://github.com/jacobmischka) |[](https://github.com/jespino) |[](https://github.com/jfrankenau) |[](https://github.com/jtdowney) |[](https://github.com/andete) |[](https://github.com/joshtriplett) |
:---: |:---: |:---: |:---: |:---: |:---: |
-[jtdowney](https://github.com/jtdowney) |[andete](https://github.com/andete) |[joshtriplett](https://github.com/joshtriplett) |[Kalwyn](https://github.com/Kalwyn) |[manuel-rhdt](https://github.com/manuel-rhdt) |[Marwes](https://github.com/Marwes) |
+[jacobmischka](https://github.com/jacobmischka) |[jespino](https://github.com/jespino) |[jfrankenau](https://github.com/jfrankenau) |[jtdowney](https://github.com/jtdowney) |[andete](https://github.com/andete) |[joshtriplett](https://github.com/joshtriplett) |
-[](https://github.com/mdaffin) |[](https://github.com/iliekturtles) |[](https://github.com/nicompte) |[](https://github.com/NickeZ) |[](https://github.com/nvzqz) |[](https://github.com/nuew) |
+[](https://github.com/Kalwyn) |[](https://github.com/manuel-rhdt) |[](https://github.com/Marwes) |[](https://github.com/mdaffin) |[](https://github.com/iliekturtles) |[](https://github.com/nicompte) |
:---: |:---: |:---: |:---: |:---: |:---: |
-[mdaffin](https://github.com/mdaffin) |[iliekturtles](https://github.com/iliekturtles) |[nicompte](https://github.com/nicompte) |[NickeZ](https://github.com/NickeZ) |[nvzqz](https://github.com/nvzqz) |[nuew](https://github.com/nuew) |
+[Kalwyn](https://github.com/Kalwyn) |[manuel-rhdt](https://github.com/manuel-rhdt) |[Marwes](https://github.com/Marwes) |[mdaffin](https://github.com/mdaffin) |[iliekturtles](https://github.com/iliekturtles) |[nicompte](https://github.com/nicompte) |
-[](https://github.com/Geogi) |[](https://github.com/focusaurus) |[](https://github.com/flying-sheep) |[](https://github.com/Phlosioneer) |[](https://github.com/peppsac) |[](https://github.com/golddranks) |
+[](https://github.com/NickeZ) |[](https://github.com/nvzqz) |[](https://github.com/nuew) |[](https://github.com/Geogi) |[](https://github.com/focusaurus) |[](https://github.com/flying-sheep) |
:---: |:---: |:---: |:---: |:---: |:---: |
-[Geogi](https://github.com/Geogi) |[focusaurus](https://github.com/focusaurus) |[flying-sheep](https://github.com/flying-sheep) |[Phlosioneer](https://github.com/Phlosioneer) |[peppsac](https://github.com/peppsac) |[golddranks](https://github.com/golddranks) |
+[NickeZ](https://github.com/NickeZ) |[nvzqz](https://github.com/nvzqz) |[nuew](https://github.com/nuew) |[Geogi](https://github.com/Geogi) |[focusaurus](https://github.com/focusaurus) |[flying-sheep](https://github.com/flying-sheep) |
-[](https://github.com/hexjelly) |[](https://github.com/rom1v) |[](https://github.com/rnelson) |[](https://github.com/segevfiner) |[](https://github.com/swatteau) |[](https://github.com/tspiteri) |
+[](https://github.com/Phlosioneer) |[](https://github.com/peppsac) |[](https://github.com/golddranks) |[](https://github.com/hexjelly) |[](https://github.com/rom1v) |[](https://github.com/rnelson) |
:---: |:---: |:---: |:---: |:---: |:---: |
-[hexjelly](https://github.com/hexjelly) |[rom1v](https://github.com/rom1v) |[rnelson](https://github.com/rnelson) |[segevfiner](https://github.com/segevfiner) |[swatteau](https://github.com/swatteau) |[tspiteri](https://github.com/tspiteri) |
+[Phlosioneer](https://github.com/Phlosioneer) |[peppsac](https://github.com/peppsac) |[golddranks](https://github.com/golddranks) |[hexjelly](https://github.com/hexjelly) |[rom1v](https://github.com/rom1v) |[rnelson](https://github.com/rnelson) |
-[](https://github.com/siiptuo) |[](https://github.com/vks) |[](https://github.com/vsupalov) |[](https://github.com/mineo) |[](https://github.com/wabain) |[](https://github.com/grossws) |
+[](https://github.com/swatteau) |[](https://github.com/tspiteri) |[](https://github.com/siiptuo) |[](https://github.com/vks) |[](https://github.com/vsupalov) |[](https://github.com/mineo) |
:---: |:---: |:---: |:---: |:---: |:---: |
-[siiptuo](https://github.com/siiptuo) |[vks](https://github.com/vks) |[vsupalov](https://github.com/vsupalov) |[mineo](https://github.com/mineo) |[wabain](https://github.com/wabain) |[grossws](https://github.com/grossws) |
+[swatteau](https://github.com/swatteau) |[tspiteri](https://github.com/tspiteri) |[siiptuo](https://github.com/siiptuo) |[vks](https://github.com/vks) |[vsupalov](https://github.com/vsupalov) |[mineo](https://github.com/mineo) |
-[](https://github.com/kennytm) |[](https://github.com/mvaude) |[](https://github.com/panicbit) |[](https://github.com/Bilalh) |
-:---: |:---: |:---: |:---: |
-[kennytm](https://github.com/kennytm) |[mvaude](https://github.com/mvaude) |[panicbit](https://github.com/panicbit) |[Bilalh](https://github.com/Bilalh) |
+[](https://github.com/wabain) |[](https://github.com/grossws) |[](https://github.com/kennytm) |[](https://github.com/mvaude) |[](https://github.com/panicbit) |[](https://github.com/ogham) |
+:---: |:---: |:---: |:---: |:---: |:---: |
+[wabain](https://github.com/wabain) |[grossws](https://github.com/grossws) |[kennytm](https://github.com/kennytm) |[mvaude](https://github.com/mvaude) |[panicbit](https://github.com/panicbit) |[ogham](https://github.com/ogham) |
diff --git a/Cargo.toml b/Cargo.toml
index 4c6bb773..603150d3 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,7 +1,7 @@
[package]
name = "clap"
-version = "2.29.1"
+version = "2.29.2"
authors = ["Kevin K. "]
exclude = ["examples/*", "clap-test/*", "tests/*", "benches/*", "*.png", "clap-perf/*", "*.dot"]
repository = "https://github.com/kbknapp/clap-rs"
@@ -9,7 +9,7 @@ documentation = "https://docs.rs/clap/"
homepage = "https://clap.rs/"
readme = "README.md"
license = "MIT"
-keywords = ["argument", "command", "arg", "parser", "parse"]
+keywords = ["argument", "cli", "arg", "parser", "parse"]
categories = ["command-line-interface"]
description = """
A simple to use, efficient, and full featured Command Line Argument Parser
diff --git a/README.md b/README.md
index 95969569..9601aaf3 100644
--- a/README.md
+++ b/README.md
@@ -42,6 +42,17 @@ Created by [gh-md-toc](https://github.com/ekalinin/github-markdown-toc)
## What's New
+Here's whats new in 2.29.2:
+
+* **Many ZSH Completions Improvements** (Thanks to @segevfiner)
+ * Positional arguments will default to file completion when not using specific values!
+ * Implement postional argument possible values completion
+ * Removes redundant code from output
+ * Don't pass `-S` to `_arguments` if Zsh is too old
+ * Fix completions with mixed positionals and subcommands
+ * String escape possible values for options
+
+
Here's whats new in 2.29.1:
* Debloats clap by deduplicating logic and refactors for a ~57% decrease in code size! This is with zero functinoality lost, and a slight perf increase!