diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0da2589b..c899466a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,13 @@
+
+## v2.18.0 (2016-11-05)
+
+
+#### Features
+
+* **Completions:** adds completion support for PowerShell. ([cff82c88](https://github.com/kbknapp/clap-rs/commit/cff82c880e21064fca63351507b80350df6caadf), closes [#729](https://github.com/kbknapp/clap-rs/issues/729))
+
+
+
### v2.17.1 (2016-11-02)
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 9015671b..a7027f01 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -1,49 +1,48 @@
-The following is a list of contributors to the [clap](https://github.com/kbknapp/clap-rs) project, in alphabetical order:
+The following is a list of contributors in alphabetical order:
-[](https://github.com/afiune) |[](https://github.com/alex-gulyas) |[](https://github.com/alexbool) |[](https://github.com/AluisioASG) |[](https://github.com/archer884) |
-:---: |:---: |:---: |:---: |:---: |
-[afiune](https://github.com/afiune) |[alex-gulyas](https://github.com/alex-gulyas) |[alexbool](https://github.com/alexbool) |[AluisioASG](https://github.com/AluisioASG) |[archer884](https://github.com/archer884) |
-[](https://github.com/Bilalh) |[](https://github.com/birkenfeld) |[](https://github.com/bradurani) |[](https://github.com/brennie) |[](https://github.com/brianp) |
-:---: |:---: |:---: |:---: |:---: |
-[Bilalh](https://github.com/Bilalh) |[birkenfeld](https://github.com/birkenfeld) |[bradurani](https://github.com/bradurani) |[brennie](https://github.com/brennie) |[brianp](https://github.com/brianp) |
+[](https://github.com/afiune) |[](https://github.com/alexbool) |[](https://github.com/AluisioASG) |[](https://github.com/AluisioASG) |[](https://github.com/archer884) |[](https://github.com/Arnavion) |
+:---: |:---: |:---: |:---: |:---: |:---: |
+[afiune](https://github.com/afiune) |[alexbool](https://github.com/alexbool) |[AluisioASG](https://github.com/AluisioASG) |[AluisioASG](https://github.com/AluisioASG) |[archer884](https://github.com/archer884) |[Arnavion](https://github.com/Arnavion) |
-[](https://github.com/Byron) |[](https://github.com/cite-reader) |[](https://github.com/cstorey) |[](https://github.com/daboross) |[](https://github.com/davidszotten) |
-:---: |:---: |:---: |:---: |:---: |
-[Byron](https://github.com/Byron) |[cite-reader](https://github.com/cite-reader) |[cstorey](https://github.com/cstorey) |[daboross](https://github.com/daboross) |[davidszotten](https://github.com/davidszotten) |
+[](https://github.com/Bilalh) |[](https://github.com/birkenfeld) |[](https://github.com/bradurani) |[](https://github.com/brennie) |[](https://github.com/brianp) |[](https://github.com/Byron) |
+:---: |:---: |:---: |:---: |:---: |:---: |
+[Bilalh](https://github.com/Bilalh) |[birkenfeld](https://github.com/birkenfeld) |[bradurani](https://github.com/bradurani) |[brennie](https://github.com/brennie) |[brianp](https://github.com/brianp) |[Byron](https://github.com/Byron) |
-[](https://github.com/dguo) |[](https://github.com/flying-sheep) |[](https://github.com/Geogi) |[](https://github.com/gohyda) |[](https://github.com/GrappigPanda) |
-:---: |:---: |:---: |:---: |:---: |
-[dguo](https://github.com/dguo) |[flying-sheep](https://github.com/flying-sheep) |[Geogi](https://github.com/Geogi) |[gohyda](https://github.com/gohyda) |[GrappigPanda](https://github.com/GrappigPanda) |
+[](https://github.com/cstorey) |[](https://github.com/daboross) |[](https://github.com/davidszotten) |[](https://github.com/dguo) |[](https://github.com/flying-sheep) |[](https://github.com/Geogi) |
+:---: |:---: |:---: |:---: |:---: |:---: |
+[cstorey](https://github.com/cstorey) |[daboross](https://github.com/daboross) |[davidszotten](https://github.com/davidszotten) |[dguo](https://github.com/dguo) |[flying-sheep](https://github.com/flying-sheep) |[Geogi](https://github.com/Geogi) |
-[](https://github.com/grossws) |[](https://github.com/hexjelly) |[](https://github.com/hgrecco) |[](https://github.com/homu) |[](https://github.com/hoodie) |
-:---: |:---: |:---: |:---: |:---: |
-[grossws](https://github.com/grossws) |[hexjelly](https://github.com/hexjelly) |[hgrecco](https://github.com/hgrecco) |[homu](https://github.com/homu) |[hoodie](https://github.com/hoodie) |
+[](https://github.com/gohyda) |[](https://github.com/GrappigPanda) |[](https://github.com/grossws) |[](https://github.com/hexjelly) |[](https://github.com/hgrecco) |[](https://github.com/homu) |
+:---: |:---: |:---: |:---: |:---: |:---: |
+[gohyda](https://github.com/gohyda) |[GrappigPanda](https://github.com/GrappigPanda) |[grossws](https://github.com/grossws) |[hexjelly](https://github.com/hexjelly) |[hgrecco](https://github.com/hgrecco) |[homu](https://github.com/homu) |
-[](https://github.com/huonw) |[](https://github.com/idmit) |[](https://github.com/iliekturtles) |[](https://github.com/james-darkfox) |[](https://github.com/japaric) |
-:---: |:---: |:---: |:---: |:---: |
-[huonw](https://github.com/huonw) |[idmit](https://github.com/idmit) |[iliekturtles](https://github.com/iliekturtles) |[james-darkfox](https://github.com/james-darkfox) |[japaric](https://github.com/japaric) |
+[](https://github.com/hoodie) |[](https://github.com/huonw) |[](https://github.com/idmit) |[](https://github.com/iliekturtles) |[](https://github.com/james-darkfox) |[](https://github.com/japaric) |
+:---: |:---: |:---: |:---: |:---: |:---: |
+[hoodie](https://github.com/hoodie) |[huonw](https://github.com/huonw) |[idmit](https://github.com/idmit) |[iliekturtles](https://github.com/iliekturtles) |[james-darkfox](https://github.com/james-darkfox) |[japaric](https://github.com/japaric) |
-[](https://github.com/jespino) |[](https://github.com/jimmycuadra) |[](https://github.com/joshtriplett) |[](https://github.com/kbknapp) |[](https://github.com/Keats) |
-:---: |:---: |:---: |:---: |:---: |
-[jespino](https://github.com/jespino) |[jimmycuadra](https://github.com/jimmycuadra) |[joshtriplett](https://github.com/joshtriplett) |[kbknapp](https://github.com/kbknapp) |[Keats](https://github.com/Keats) |
+[](https://github.com/jespino) |[](https://github.com/jimmycuadra) |[](https://github.com/joshtriplett) |[](https://github.com/joshtriplett) |[](https://github.com/kbknapp) |[](https://github.com/Keats) |
+:---: |:---: |:---: |:---: |:---: |:---: |
+[jespino](https://github.com/jespino) |[jimmycuadra](https://github.com/jimmycuadra) |[joshtriplett](https://github.com/joshtriplett) |[joshtriplett](https://github.com/joshtriplett) |[kbknapp](https://github.com/kbknapp) |[Keats](https://github.com/Keats) |
-[](https://github.com/messense) |[](https://github.com/N-006) |[](https://github.com/nabijaczleweli) |[](https://github.com/nelsonjchen) |[](https://github.com/nicompte) |
-:---: |:---: |:---: |:---: |:---: |
-[messense](https://github.com/messense) |[N-006](https://github.com/N-006) |[nabijaczleweli](https://github.com/nabijaczleweli) |[nelsonjchen](https://github.com/nelsonjchen) |[nicompte](https://github.com/nicompte) |
+[](https://github.com/matthiasbeyer) |[](https://github.com/messense) |[](https://github.com/mvaude) |[](https://github.com/N-006) |[](https://github.com/nabijaczleweli) |[](https://github.com/nelsonjchen) |
+:---: |:---: |:---: |:---: |:---: |:---: |
+[matthiasbeyer](https://github.com/matthiasbeyer) |[messense](https://github.com/messense) |[mvaude](https://github.com/mvaude) |[N-006](https://github.com/N-006) |[nabijaczleweli](https://github.com/nabijaczleweli) |[nelsonjchen](https://github.com/nelsonjchen) |
-[](https://github.com/nvzqz) |[](https://github.com/ogham) |[](https://github.com/panicbit) |[](https://github.com/rnelson) |[](https://github.com/rtaycher) |
-:---: |:---: |:---: |:---: |:---: |
-[nvzqz](https://github.com/nvzqz) |[ogham](https://github.com/ogham) |[panicbit](https://github.com/panicbit) |[rnelson](https://github.com/rnelson) |[rtaycher](https://github.com/rtaycher) |
+[](https://github.com/Nemo157) |[](https://github.com/nicompte) |[](https://github.com/nvzqz) |[](https://github.com/ogham) |[](https://github.com/panicbit) |[](https://github.com/rnelson) |
+:---: |:---: |:---: |:---: |:---: |:---: |
+[Nemo157](https://github.com/Nemo157) |[nicompte](https://github.com/nicompte) |[nvzqz](https://github.com/nvzqz) |[ogham](https://github.com/ogham) |[panicbit](https://github.com/panicbit) |[rnelson](https://github.com/rnelson) |
-[](https://github.com/SirVer) |[](https://github.com/sru) |[](https://github.com/SShrike) |[](https://github.com/starkat99) |[](https://github.com/swatteau) |
-:---: |:---: |:---: |:---: |:---: |
-[SirVer](https://github.com/SirVer) |[sru](https://github.com/sru) |[SShrike](https://github.com/SShrike) |[starkat99](https://github.com/starkat99) |[swatteau](https://github.com/swatteau) |
+[](https://github.com/rtaycher) |[](https://github.com/SirVer) |[](https://github.com/sru) |[](https://github.com/SShrike) |[](https://github.com/starkat99) |[](https://github.com/swatteau) |
+:---: |:---: |:---: |:---: |:---: |:---: |
+[rtaycher](https://github.com/rtaycher) |[SirVer](https://github.com/SirVer) |[sru](https://github.com/sru) |[SShrike](https://github.com/SShrike) |[starkat99](https://github.com/starkat99) |[swatteau](https://github.com/swatteau) |
+
+[](https://github.com/tanakh) |[](https://github.com/th4t) |[](https://github.com/tormol) |[](https://github.com/tshepang) |[](https://github.com/untitaker) |[](https://github.com/Vinatorul) |
+:---: |:---: |:---: |:---: |:---: |:---: |
+[tanakh](https://github.com/tanakh) |[th4t](https://github.com/th4t) |[tormol](https://github.com/tormol) |[tshepang](https://github.com/tshepang) |[untitaker](https://github.com/untitaker) |[Vinatorul](https://github.com/Vinatorul) |
+
+[](https://github.com/vks) |[](https://github.com/volks73) |[](https://github.com/wdv4758h) |
+:---: |:---: |:---: |
+[vks](https://github.com/vks) |[volks73](https://github.com/volks73) |[wdv4758h](https://github.com/wdv4758h) |
-[](https://github.com/tanakh) |[](https://github.com/th4t) |[](https://github.com/tormol) |[](https://github.com/tshepang) |[](https://github.com/untitaker) |
-:---: |:---: |:---: |:---: |:---: |
-[tanakh](https://github.com/tanakh) |[th4t](https://github.com/th4t) |[tormol](https://github.com/tormol) |[tshepang](https://github.com/tshepang) |[untitaker](https://github.com/untitaker) |
-[](https://github.com/Vinatorul) |[](https://github.com/vks) |[](https://github.com/volks73) |[](https://github.com/wdv4758h) | |
-:---: |:---: |:---: |:---: |
-[Vinatorul](https://github.com/Vinatorul) |[vks](https://github.com/vks) |[volks73](https://github.com/volks73) |[wdv4758h](https://github.com/wdv4758h) | [Yo-Bot](https://github.com/yo-bot) |
\ No newline at end of file
diff --git a/Cargo.toml b/Cargo.toml
index fcd7db4d..00aa940f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,7 +1,7 @@
[package]
name = "clap"
-version = "2.17.1"
+version = "2.18.0"
authors = ["Kevin K. "]
exclude = ["examples/*", "clap-test/*", "tests/*", "benches/*", "*.png", "clap-perf/*", "*.dot"]
repository = "https://github.com/kbknapp/clap-rs.git"
diff --git a/README.md b/README.md
index 2023df77..4ed687d6 100644
--- a/README.md
+++ b/README.md
@@ -41,6 +41,10 @@ Created by [gh-md-toc](https://github.com/ekalinin/github-markdown-toc)
## What's New
+Here's what's new in v2.18.0
+
+* **Completions:** Adds completion support for Microsoft PowerShell! (Thanks to @Arnavion)
+
Here's what's new in v2.17.1
* Fixes a bug where using low index multiples was propagated to subcommands
diff --git a/justfile b/justfile
new file mode 100644
index 00000000..5ea0ac25
--- /dev/null
+++ b/justfile
@@ -0,0 +1,9 @@
+update-contributors:
+ @echo 'Removing old CONTRIBUTORS.md'
+ @mv CONTRIBUTORS.md CONTRIBUTORS.md.bak
+ @echo 'Downloading a list of new contributors'
+ @echo "The following is a list of contributors in alphabetical order:" > CONTRIBUTORS.md
+ @echo "" >> CONTRIBUTORS.md
+ @echo "" >> CONTRIBUTORS.md
+ @githubcontrib --owner kbknapp --repo clap-rs --sha master --cols 6 --format md --showlogin true --sortBy login >> CONTRIBUTORS.md
+ @rm CONTRIBUTORS.md.bak