Fixed overflow bugs
Merge branch 'encryption' of github.com:kelvinau/VPN-Implementation into encryption