fix ticket 40,41
Merge branch 'master' of https://github.com/hongb17/boltvpn