add telnet
Merge branch 'dev'