Merge pull request #1 from ovpn-to/patch-3

Patch 3
Revert "Patch 3"
Merge pull request #2 from ovpn-to/revert-1-patch-3

Revert "Patch 3"
Merge pull request #4 from ovpn-to/master

Merge pull request #1 from ovpn-to/patch-3