diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1e85c4f..afbe865 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,7 +5,11 @@ This project follows [semantic versioning](http://semver.org).
 ### UNRELEASED
 
 - [added] Added interactive configuration wizard
+- [added] Support for (un-)installation
+- [added] Building static binaries
 - [changed] Restructured example config
+- [changed] Changed Rust version to 1.50.0
+- [changed] Updated dependencies
 
 ### v2.1.0 (2021-02-06)
 
diff --git a/Cargo.lock b/Cargo.lock
index d1e064e..0b3b90a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -621,14 +621,14 @@ dependencies = [
 
 [[package]]
 name = "parking_lot_core"
-version = "0.8.2"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ccb628cad4f84851442432c60ad8e1f607e29752d0bf072cbd0baf28aa34272"
+checksum = "fa7a782938e745763fe6907fc6ba86946d72f49fe7e21de074e08128a99fb018"
 dependencies = [
  "cfg-if 1.0.0",
  "instant",
  "libc",
- "redox_syscall 0.1.57",
+ "redox_syscall",
  "smallvec",
  "winapi",
 ]
@@ -724,9 +724,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.8"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "991431c3519a3f36861882da93630ce66b52918dcf1b8e2fd66b397fc96f28df"
+checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7"
 dependencies = [
  "proc-macro2",
 ]
@@ -755,9 +755,9 @@ dependencies = [
 
 [[package]]
 name = "rand_core"
-version = "0.6.1"
+version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c026d7df8b298d90ccbbc5190bd04d85e159eaf5576caeacf8741da93ccbd2e5"
+checksum = "34cf66eb183df1c5876e2dcf6b13d57340741e8dc255b48e40a26de954d06ae7"
 dependencies = [
  "getrandom",
 ]
@@ -798,15 +798,9 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.1.57"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce"
-
-[[package]]
-name = "redox_syscall"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05ec8ca9416c5ea37062b502703cd7fcb207736bc294f6e0cf367ac6fc234570"
+checksum = "94341e4e44e24f6b591b59e47a8a027df12e008d73fd5672dbea9cc22f4507d9"
 dependencies = [
  "bitflags",
 ]
@@ -959,9 +953,9 @@ dependencies = [
 
 [[package]]
 name = "sha-1"
-version = "0.9.3"
+version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4b312c3731e3fe78a185e6b9b911a7aa715b8e31cce117975219aab2acf285d"
+checksum = "dfebf75d25bd900fd1e7d11501efab59bc846dbc76196839663e6637bba9f25f"
 dependencies = [
  "block-buffer",
  "cfg-if 1.0.0",
@@ -1106,7 +1100,7 @@ dependencies = [
  "cfg-if 1.0.0",
  "libc",
  "rand",
- "redox_syscall 0.2.4",
+ "redox_syscall",
  "remove_dir_all",
  "winapi",
 ]
diff --git a/contrib/asciinema-recorder/Dockerfile b/contrib/asciinema-recorder/Dockerfile
new file mode 100644
index 0000000..53c152d
--- /dev/null
+++ b/contrib/asciinema-recorder/Dockerfile
@@ -0,0 +1,9 @@
+FROM ubuntu
+
+RUN apt-get update && apt-get install -y asciinema
+RUN mkdir /root/.asciinema
+RUN mkdir /etc/vpncloud
+
+WORKDIR /data
+ADD config /root/.asciinema/config
+RUN echo 'PS1="\[\e[00;34m\]\[\e[01;31m\]\u\[\e[00;01;34m\]@\[\e[00;34m\]node\[\e[01;31m\]:\[\e[00;34m\]\w\[\e[01;31m\]> \[\e[00m\]"' >> /root/.bashrc
\ No newline at end of file
diff --git a/contrib/asciinema-recorder/config b/contrib/asciinema-recorder/config
new file mode 100644
index 0000000..5746cd5
--- /dev/null
+++ b/contrib/asciinema-recorder/config
@@ -0,0 +1,3 @@
+[record]
+command = /usr/bin/bash -l
+idle_time_limit = 2.5
\ No newline at end of file
diff --git a/contrib/asciinema-recorder/record.sh b/contrib/asciinema-recorder/record.sh
new file mode 100755
index 0000000..c9d9da4
--- /dev/null
+++ b/contrib/asciinema-recorder/record.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+set -e 
+
+docker build -t asciinema-recorder .
+docker run -it --rm --network host -v $(pwd)/../../target/release/:/usr/local/bin/ -v $(pwd):/data asciinema-recorder asciinema "$@"
\ No newline at end of file
diff --git a/contrib/WSProxyCloudFormation.yaml b/contrib/aws/WSProxyCloudFormation.yaml
similarity index 100%
rename from contrib/WSProxyCloudFormation.yaml
rename to contrib/aws/WSProxyCloudFormation.yaml
diff --git a/contrib/common.py b/contrib/aws/common.py
similarity index 100%
rename from contrib/common.py
rename to contrib/aws/common.py
diff --git a/contrib/example.py b/contrib/aws/example.py
similarity index 100%
rename from contrib/example.py
rename to contrib/aws/example.py
diff --git a/contrib/measurements/2020-06-08_1.0.0_perf.json b/contrib/aws/measurements/2020-06-08_1.0.0_perf.json
similarity index 100%
rename from contrib/measurements/2020-06-08_1.0.0_perf.json
rename to contrib/aws/measurements/2020-06-08_1.0.0_perf.json
diff --git a/contrib/measurements/2020-06-08_1.1.0_perf.json b/contrib/aws/measurements/2020-06-08_1.1.0_perf.json
similarity index 100%
rename from contrib/measurements/2020-06-08_1.1.0_perf.json
rename to contrib/aws/measurements/2020-06-08_1.1.0_perf.json
diff --git a/contrib/measurements/2020-06-08_1.2.0_perf.json b/contrib/aws/measurements/2020-06-08_1.2.0_perf.json
similarity index 100%
rename from contrib/measurements/2020-06-08_1.2.0_perf.json
rename to contrib/aws/measurements/2020-06-08_1.2.0_perf.json
diff --git a/contrib/measurements/2020-06-08_1.3.0_perf.json b/contrib/aws/measurements/2020-06-08_1.3.0_perf.json
similarity index 100%
rename from contrib/measurements/2020-06-08_1.3.0_perf.json
rename to contrib/aws/measurements/2020-06-08_1.3.0_perf.json
diff --git a/contrib/measurements/2020-06-08_1.4.0_perf.json b/contrib/aws/measurements/2020-06-08_1.4.0_perf.json
similarity index 100%
rename from contrib/measurements/2020-06-08_1.4.0_perf.json
rename to contrib/aws/measurements/2020-06-08_1.4.0_perf.json
diff --git a/contrib/measurements/2020-10-28_2.0.0_perf.json b/contrib/aws/measurements/2020-10-28_2.0.0_perf.json
similarity index 100%
rename from contrib/measurements/2020-10-28_2.0.0_perf.json
rename to contrib/aws/measurements/2020-10-28_2.0.0_perf.json
diff --git a/contrib/measurements/2021-02-06_2.1.0_perf.json b/contrib/aws/measurements/2021-02-06_2.1.0_perf.json
similarity index 100%
rename from contrib/measurements/2021-02-06_2.1.0_perf.json
rename to contrib/aws/measurements/2021-02-06_2.1.0_perf.json
diff --git a/contrib/performance.py b/contrib/aws/performance.py
similarity index 100%
rename from contrib/performance.py
rename to contrib/aws/performance.py
diff --git a/contrib/testnet.py b/contrib/aws/testnet.py
similarity index 100%
rename from contrib/testnet.py
rename to contrib/aws/testnet.py