Merge pull request #252 from eokerson/vpnfixes