Merge pull request #579 from cshore/pull-request-protocol-vpnc