+ Connect and disconnect safety

+ tests
Merge branch 'master' of https://github.com/tmteam/TheTunnel