fixes
Merge branch 'master' of https://github.com/rsingla92/a3-vpn